drm/amdgpu: Update TA version output in driver

TA version should only be displayed in firmware version column.

Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: John Clements <john.clements@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 d2955ea..dfe667e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -340,32 +340,32 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
        case AMDGPU_INFO_FW_TA:
                switch (query_fw->index) {
                case TA_FW_TYPE_PSP_XGMI:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.xgmi_context.context.bin_desc.fw_version;
                        fw_info->feature = adev->psp.xgmi_context.context
                                                   .bin_desc.feature_version;
                        break;
                case TA_FW_TYPE_PSP_RAS:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.ras_context.context.bin_desc.fw_version;
                        fw_info->feature = adev->psp.ras_context.context
                                                   .bin_desc.feature_version;
                        break;
                case TA_FW_TYPE_PSP_HDCP:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.hdcp_context.context.bin_desc.fw_version;
                        fw_info->feature = adev->psp.hdcp_context.context
                                                   .bin_desc.feature_version;
                        break;
                case TA_FW_TYPE_PSP_DTM:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.dtm_context.context.bin_desc.fw_version;
                        fw_info->feature = adev->psp.dtm_context.context
                                                   .bin_desc.feature_version;
                        break;
                case TA_FW_TYPE_PSP_RAP:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.rap_context.context.bin_desc.fw_version;
                        fw_info->feature = adev->psp.rap_context.context
                                                   .bin_desc.feature_version;
                        break;
                case TA_FW_TYPE_PSP_SECUREDISPLAY:
-                       fw_info->ver = adev->psp.ta_fw_version;
+                       fw_info->ver = adev->psp.securedisplay_context.context.bin_desc.fw_version;
                        fw_info->feature =
                                adev->psp.securedisplay_context.context.bin_desc
                                        .feature_version;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index fd04e83..c641f84 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1115,7 +1115,7 @@ int psp_xgmi_get_node_id(struct psp_context *psp, uint64_t *node_id)
 static bool psp_xgmi_peer_link_info_supported(struct psp_context *psp)
 {
        return psp->adev->ip_versions[MP0_HWIP][0] == IP_VERSION(13, 0, 2) &&
-               psp->xgmi_context.context.bin_desc.feature_version >= 0x2000000b;
+               psp->xgmi_context.context.bin_desc.fw_version >= 0x2000000b;
 }
 
 /*
@@ -3108,32 +3108,32 @@ static int parse_ta_bin_descriptor(struct psp_context *psp,
                psp->asd_context.bin_desc.start_addr        = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_XGMI:
-               psp->xgmi_context.context.bin_desc.feature_version  = le32_to_cpu(desc->fw_version);
+               psp->xgmi_context.context.bin_desc.fw_version       = le32_to_cpu(desc->fw_version);
                psp->xgmi_context.context.bin_desc.size_bytes       = le32_to_cpu(desc->size_bytes);
                psp->xgmi_context.context.bin_desc.start_addr       = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_RAS:
-               psp->ras_context.context.bin_desc.feature_version   = le32_to_cpu(desc->fw_version);
+               psp->ras_context.context.bin_desc.fw_version        = le32_to_cpu(desc->fw_version);
                psp->ras_context.context.bin_desc.size_bytes        = le32_to_cpu(desc->size_bytes);
                psp->ras_context.context.bin_desc.start_addr        = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_HDCP:
-               psp->hdcp_context.context.bin_desc.feature_version  = le32_to_cpu(desc->fw_version);
+               psp->hdcp_context.context.bin_desc.fw_version       = le32_to_cpu(desc->fw_version);
                psp->hdcp_context.context.bin_desc.size_bytes       = le32_to_cpu(desc->size_bytes);
                psp->hdcp_context.context.bin_desc.start_addr       = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_DTM:
-               psp->dtm_context.context.bin_desc.feature_version  = le32_to_cpu(desc->fw_version);
+               psp->dtm_context.context.bin_desc.fw_version       = le32_to_cpu(desc->fw_version);
                psp->dtm_context.context.bin_desc.size_bytes       = le32_to_cpu(desc->size_bytes);
                psp->dtm_context.context.bin_desc.start_addr       = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_RAP:
-               psp->rap_context.context.bin_desc.feature_version  = le32_to_cpu(desc->fw_version);
+               psp->rap_context.context.bin_desc.fw_version       = le32_to_cpu(desc->fw_version);
                psp->rap_context.context.bin_desc.size_bytes       = le32_to_cpu(desc->size_bytes);
                psp->rap_context.context.bin_desc.start_addr       = ucode_start_addr;
                break;
        case TA_FW_TYPE_PSP_SECUREDISPLAY:
-               psp->securedisplay_context.context.bin_desc.feature_version =
+               psp->securedisplay_context.context.bin_desc.fw_version =
                        le32_to_cpu(desc->fw_version);
                psp->securedisplay_context.context.bin_desc.size_bytes =
                        le32_to_cpu(desc->size_bytes);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 920c4f6..ca33505 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -527,8 +527,8 @@ FW_VERSION_ATTR(mec_fw_version, 0444, gfx.mec_fw_version);
 FW_VERSION_ATTR(mec2_fw_version, 0444, gfx.mec2_fw_version);
 FW_VERSION_ATTR(sos_fw_version, 0444, psp.sos.fw_version);
 FW_VERSION_ATTR(asd_fw_version, 0444, psp.asd_context.bin_desc.fw_version);
-FW_VERSION_ATTR(ta_ras_fw_version, 0444, psp.ras_context.context.bin_desc.feature_version);
-FW_VERSION_ATTR(ta_xgmi_fw_version, 0444, psp.xgmi_context.context.bin_desc.feature_version);
+FW_VERSION_ATTR(ta_ras_fw_version, 0444, psp.ras_context.context.bin_desc.fw_version);
+FW_VERSION_ATTR(ta_xgmi_fw_version, 0444, psp.xgmi_context.context.bin_desc.fw_version);
 FW_VERSION_ATTR(smc_fw_version, 0444, pm.fw_version);
 FW_VERSION_ATTR(sdma_fw_version, 0444, sdma.instance[0].fw_version);
 FW_VERSION_ATTR(sdma2_fw_version, 0444, sdma.instance[1].fw_version);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 99c1493..04cf9b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -535,9 +535,9 @@ static void amdgpu_virt_populate_vf2pf_ucode_info(struct amdgpu_device *adev)
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_ASD,
                            adev->psp.asd_context.bin_desc.fw_version);
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_RAS,
-                           adev->psp.ras_context.context.bin_desc.feature_version);
+                           adev->psp.ras_context.context.bin_desc.fw_version);
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_XGMI,
-                           adev->psp.xgmi_context.context.bin_desc.feature_version);
+                           adev->psp.xgmi_context.context.bin_desc.fw_version);
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SMC,      adev->pm.fw_version);
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SDMA,     adev->sdma.instance[0].fw_version);
        POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SDMA2,    adev->sdma.instance[1].fw_version);

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index 5964401..ed22936 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -84,7 +84,7 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
 
                ta_hdr = (const struct ta_firmware_header_v1_0 *)
                                 adev->psp.ta_fw->data;
-               adev->psp.hdcp_context.context.bin_desc.feature_version =
+               adev->psp.hdcp_context.context.bin_desc.fw_version =
                        le32_to_cpu(ta_hdr->hdcp.fw_version);
                adev->psp.hdcp_context.context.bin_desc.size_bytes =
                        le32_to_cpu(ta_hdr->hdcp.size_bytes);
@@ -92,7 +92,7 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
                        (uint8_t *)ta_hdr +
                        le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
 
-               adev->psp.dtm_context.context.bin_desc.feature_version =
+               adev->psp.dtm_context.context.bin_desc.fw_version =
                        le32_to_cpu(ta_hdr->dtm.fw_version);
                adev->psp.dtm_context.context.bin_desc.size_bytes =
                        le32_to_cpu(ta_hdr->dtm.size_bytes);
@@ -100,7 +100,7 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
                        (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +
                        le32_to_cpu(ta_hdr->dtm.offset_bytes);
 
-               adev->psp.securedisplay_context.context.bin_desc.feature_version =
+               adev->psp.securedisplay_context.context.bin_desc.fw_version =
                        le32_to_cpu(ta_hdr->securedisplay.fw_version);
                adev->psp.securedisplay_context.context.bin_desc.size_bytes =
                        le32_to_cpu(ta_hdr->securedisplay.size_bytes);

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 21a325e..2176ef8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -151,7 +151,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                                goto out2;
 
                        ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                       adev->psp.xgmi_context.context.bin_desc.feature_version =
+                       adev->psp.xgmi_context.context.bin_desc.fw_version =
                                le32_to_cpu(ta_hdr->xgmi.fw_version);
                        adev->psp.xgmi_context.context.bin_desc.size_bytes =
                                le32_to_cpu(ta_hdr->xgmi.size_bytes);
@@ -159,7 +159,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                                (uint8_t *)ta_hdr +
                                le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
                        adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
-                       adev->psp.ras_context.context.bin_desc.feature_version =
+                       adev->psp.ras_context.context.bin_desc.fw_version =
                                le32_to_cpu(ta_hdr->ras.fw_version);
                        adev->psp.ras_context.context.bin_desc.size_bytes =
                                le32_to_cpu(ta_hdr->ras.size_bytes);
@@ -192,7 +192,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                                goto out2;
 
                        ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                       adev->psp.hdcp_context.context.bin_desc.feature_version =
+                       adev->psp.hdcp_context.context.bin_desc.fw_version =
                                le32_to_cpu(ta_hdr->hdcp.fw_version);
                        adev->psp.hdcp_context.context.bin_desc.size_bytes =
                                le32_to_cpu(ta_hdr->hdcp.size_bytes);
@@ -203,7 +203,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 
                        adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
 
-                       adev->psp.dtm_context.context.bin_desc.feature_version =
+                       adev->psp.dtm_context.context.bin_desc.fw_version =
                                le32_to_cpu(ta_hdr->dtm.fw_version);
                        adev->psp.dtm_context.context.bin_desc.size_bytes =
                                le32_to_cpu(ta_hdr->dtm.size_bytes);

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index 281bc4d..a258820 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
@@ -84,7 +84,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
 
                ta_hdr = (const struct ta_firmware_header_v1_0 *)
                                 adev->psp.ta_fw->data;
-               adev->psp.hdcp_context.context.bin_desc.feature_version =
+               adev->psp.hdcp_context.context.bin_desc.fw_version =
                        le32_to_cpu(ta_hdr->hdcp.fw_version);
                adev->psp.hdcp_context.context.bin_desc.size_bytes =
                        le32_to_cpu(ta_hdr->hdcp.size_bytes);
@@ -94,7 +94,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
 
                adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
 
-               adev->psp.dtm_context.context.bin_desc.feature_version =
+               adev->psp.dtm_context.context.bin_desc.fw_version =
                        le32_to_cpu(ta_hdr->dtm.fw_version);
                adev->psp.dtm_context.context.bin_desc.size_bytes =
                        le32_to_cpu(ta_hdr->dtm.size_bytes);