drm/amdgpu: add VPE FW version query support

Add support to query VPE FW version.

Signed-off-by: Lang Yu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 21c4904d283f01ccf6f36d22fb4241bb14cd8aa5..3a48bec10aea8bbecfc106c6d8e04224bbc991d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -352,6 +352,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
                fw_info->ver = adev->gfx.imu_fw_version;
                fw_info->feature = 0;
                break;
+       case AMDGPU_INFO_FW_VPE:
+               fw_info->ver = adev->vpe.fw_version;
+               fw_info->feature = adev->vpe.feature_version;
+               break;
        default:
                return -EINVAL;
        }
@@ -1731,6 +1735,14 @@ static int amdgpu_debugfs_firmware_info_show(struct seq_file *m, void *unused)
        seq_printf(m, "MES feature version: %u, firmware version: 0x%08x\n",
                   fw_info.feature, fw_info.ver);
 
+       /* VPE */
+       query_fw.fw_type = AMDGPU_INFO_FW_VPE;
+       ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);
+       if (ret)
+               return ret;
+       seq_printf(m, "VPE feature version: %u, firmware version: 0x%08x\n",
+                  fw_info.feature, fw_info.ver);
+
        seq_printf(m, "VBIOS version: %s\n", ctx->vbios_pn);
 
        return 0;

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 6289b257546416689ff26736f369490ea8d09623..ec437120b083fe81a0b0961c9e6307ce2d2137ec 100644 (file)
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -798,6 +798,8 @@ struct drm_amdgpu_cs_chunk_cp_gfx_shadow {
        #define AMDGPU_INFO_FW_MES              0x1a
        /* Subquery id: Query IMU firmware version */
        #define AMDGPU_INFO_FW_IMU              0x1b
+       /* Subquery id: Query VPE firmware version */
+       #define AMDGPU_INFO_FW_VPE              0x1c
 
 /* number of bytes moved for TTM migration */
 #define AMDGPU_INFO_NUM_BYTES_MOVED            0x0f