2 files changed, 11 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 85d2149b9dbe..13607e28c1c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -801,6 +801,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                 else
                                         strcpy(fw_name, "amdgpu/vega10_smc.bin");
                                 break;
+                        case CHIP_RAVEN:
+                                adev->pm.fw_version = info->version;
+                                return 0;
                         default:
                                 DRM_ERROR("SMC firmware not supported\n");
                                 return -EINVAL;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
index b98ade676d12..2d662b44af54 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
@@ -305,6 +305,14 @@ static int rv_smu_fini(struct pp_hwmgr *hwmgr)
 
 static int rv_start_smu(struct pp_hwmgr *hwmgr)
 {
+        struct cgs_firmware_info info = {0};
+
+        smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetSmuVersion);
+        rv_read_arg_from_smc(hwmgr, &hwmgr->smu_version);
+        info.version = hwmgr->smu_version >> 8;
+
+        cgs_get_firmware_info(hwmgr->device, CGS_UCODE_ID_SMU, &info);
+
         if (rv_verify_smc_interface(hwmgr))
                 return -EINVAL;
         if (rv_smc_enable_sdma(hwmgr))