Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82eb0f30 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: update smu_version value for CI/VI 



Set the new common smu firmware version for smu7 parts (CI and VI).

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d100033b

drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c

+1 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,7 @@ static int ci_load_smc_ucode(struct pp_hwmgr *hwmgr) 
	cgs_get_firmware_info(hwmgr->device, CGS_UCODE_ID_SMU, &info);



	hwmgr->is_kicker = info.is_kicker;

	hwmgr->smu_version = info.version;

	byte_count = info.image_size;

	src = (uint8_t *)info.kptr;

	start_addr = info.ucode_start_address;

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int iceland_smu_upload_firmware_image(struct pp_hwmgr *hwmgr) 
		pr_err("[ powerplay ] SMC address is beyond the SMC RAM area\n");

		return -EINVAL;

	}



	hwmgr->smu_version = info.version;

	/* wait for smc boot up */

	PHM_WAIT_INDIRECT_FIELD_UNEQUAL(hwmgr, SMC_IND,

					 RCU_UC_EVENTS, boot_seq_done, 0);

drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ int smu7_upload_smu_firmware_image(struct pp_hwmgr *hwmgr) 
			smu7_convert_fw_type_to_cgs(UCODE_ID_SMU_SK), &info);



	hwmgr->is_kicker = info.is_kicker;



	hwmgr->smu_version = info.version;

	result = smu7_upload_smc_firmware_data(hwmgr, info.image_size, (uint32_t *)info.kptr, SMU7_SMC_SIZE);



	return result;