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: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index c6c741a3854543c0c9489780720373521d4949e3..0b4a55660de47f1d5e79f4d19596717864bf6e29 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
index d75bb998bb201089b6a2bd591b168b9b6a6f309e..125312691f7539689e467fdcdc580bf9d45fa1a7 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -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);

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
index 7f5359a97ef2d8f4a4182b1e708a2eff071f4be0..cb95e882b98f9f2ccdcd9ef92776709d614d3d99 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
@@ -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;