drm/amdgpu:add fw version entry to info

Signed-off-by: Frank Min <Frank.Min@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 43 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index f1c53a2b09c6..7a8bfa34682f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -711,6 +711,47 @@ static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucode
         return -EINVAL;
 }
 
+static uint16_t amdgpu_get_firmware_version(struct cgs_device *cgs_device,
+                                        enum cgs_ucode_id type)
+{
+        CGS_FUNC_ADEV;
+        uint16_t fw_version;
+
+        switch (type) {
+                case CGS_UCODE_ID_SDMA0:
+                        fw_version = adev->sdma.instance[0].fw_version;
+                        break;
+                case CGS_UCODE_ID_SDMA1:
+                        fw_version = adev->sdma.instance[1].fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_CE:
+                        fw_version = adev->gfx.ce_fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_PFP:
+                        fw_version = adev->gfx.pfp_fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_ME:
+                        fw_version = adev->gfx.me_fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_MEC:
+                        fw_version = adev->gfx.mec_fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_MEC_JT1:
+                        fw_version = adev->gfx.mec_fw_version;
+                        break;
+                case CGS_UCODE_ID_CP_MEC_JT2:
+                        fw_version = adev->gfx.mec_fw_version;
+                        break;
+                case CGS_UCODE_ID_RLC_G:
+                        fw_version = adev->gfx.rlc_fw_version;
+                        break;
+                default:
+                        DRM_ERROR("firmware type %d do not have version\n", type);
+                        fw_version = 0;
+        }
+        return fw_version;
+}
+
 static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                         enum cgs_ucode_id type,
                                         struct cgs_firmware_info *info)
@@ -741,6 +782,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                 info->mc_addr = gpu_addr;
                 info->image_size = data_size;
                 info->version = (uint16_t)le32_to_cpu(header->header.ucode_version);
+                info->fw_version = amdgpu_get_firmware_version(cgs_device, type);
                 info->feature_version = (uint16_t)le32_to_cpu(header->ucode_feature_version);
         } else {
                 char fw_name[30] = {0};
diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
index 6aa8938fd826..df7c18b6a02a 100644..100755
--- a/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h
@@ -161,6 +161,7 @@ struct cgs_clock_limits {
  */
 struct cgs_firmware_info {
         uint16_t                version;
+        uint16_t                fw_version;
         uint16_t                feature_version;
         uint32_t                image_size;
         uint64_t                mc_addr;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index 02fe1df855a9..02fe1df855a9 100644..100755
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c