drm/amdgpu: add MES and MES-KIQ version in debugfs

This patch addes MES and MES-KIQ version in debugfs.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Tim Huang <Tim.Huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 437df1d..fe23e09 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -336,6 +336,14 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
                fw_info->ver = adev->psp.cap_fw_version;
                fw_info->feature = adev->psp.cap_feature_version;
                break;
+       case AMDGPU_INFO_FW_MES_KIQ:
+               fw_info->ver = adev->mes.ucode_fw_version[0];
+               fw_info->feature = 0;
+               break;
+       case AMDGPU_INFO_FW_MES:
+               fw_info->ver = adev->mes.ucode_fw_version[1];
+               fw_info->feature = 0;
+               break;
        default:
                return -EINVAL;
        }
@@ -1605,6 +1613,22 @@ static int amdgpu_debugfs_firmware_info_show(struct seq_file *m, void *unused)
                                fw_info.feature, fw_info.ver);
        }
 
+       /* MES_KIQ */
+       query_fw.fw_type = AMDGPU_INFO_FW_MES_KIQ;
+       ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);
+       if (ret)
+               return ret;
+       seq_printf(m, "MES_KIQ feature version: %u, firmware version: 0x%08x\n",
+                  fw_info.feature, fw_info.ver);
+
+       /* MES */
+       query_fw.fw_type = AMDGPU_INFO_FW_MES;
+       ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);
+       if (ret)
+               return ret;
+       seq_printf(m, "MES feature version: %u, firmware version: 0x%08x\n",
+                  fw_info.feature, fw_info.ver);
+
        seq_printf(m, "VBIOS version: %s\n", ctx->vbios_version);
 
        return 0;

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 10594fc..7ee65c0 100644 (file)
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -759,6 +759,10 @@ struct drm_amdgpu_cs_chunk_data {
        #define AMDGPU_INFO_FW_GFX_RLCP         0x17
        /* Subquery id: Query GFX RLCV firmware version */
        #define AMDGPU_INFO_FW_GFX_RLCV         0x18
+       /* Subquery id: Query MES_KIQ firmware version */
+       #define AMDGPU_INFO_FW_MES_KIQ          0x19
+       /* Subquery id: Query MES firmware version */
+       #define AMDGPU_INFO_FW_MES              0x1a
 
 /* number of bytes moved for TTM migration */
 #define AMDGPU_INFO_NUM_BYTES_MOVED            0x0f