[PATCH 2/2] drm/amdgpu: remove deprecated MES version vars

[Xiao, Jack]

[AMD Official Use Only - General]

The series is Reviewed-by: Jack Xiao <Jack.Xiao at amd.com>

Regards,
Jack
________________________________
From: Sider, Graham <Graham.Sider at amd.com>
Sent: Wednesday, 26 October 2022 03:20
To: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Xiao, Jack <Jack.Xiao at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>; Sider, Graham <Graham.Sider at amd.com>
Subject: [PATCH 2/2] drm/amdgpu: remove deprecated MES version vars

MES scheduler and kiq versions are stored in mes.sched_version and
mes.kiq_version, respectively, which are read from a register after
their queues are initialized. Remove mes.ucode_fw_version and
mes.data_fw_version which tried to read this versioning info from the
firmware headers (which don't contain this information).

Signed-off-by: Graham Sider <Graham.Sider at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 --
 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c  | 4 ----
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c  | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
index ad980f4b66e1..97c05d08a551 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
@@ -91,14 +91,12 @@ struct amdgpu_mes {
         struct amdgpu_bo                *ucode_fw_obj[AMDGPU_MAX_MES_PIPES];
         uint64_t                        ucode_fw_gpu_addr[AMDGPU_MAX_MES_PIPES];
         uint32_t                        *ucode_fw_ptr[AMDGPU_MAX_MES_PIPES];
-       uint32_t                        ucode_fw_version[AMDGPU_MAX_MES_PIPES];
         uint64_t                        uc_start_addr[AMDGPU_MAX_MES_PIPES];

         /* mes ucode data */
         struct amdgpu_bo                *data_fw_obj[AMDGPU_MAX_MES_PIPES];
         uint64_t                        data_fw_gpu_addr[AMDGPU_MAX_MES_PIPES];
         uint32_t                        *data_fw_ptr[AMDGPU_MAX_MES_PIPES];
-       uint32_t                        data_fw_version[AMDGPU_MAX_MES_PIPES];
         uint64_t                        data_start_addr[AMDGPU_MAX_MES_PIPES];

         /* eop gpu obj */
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
index 067d10073a56..1abdf8b7ab50 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
@@ -415,10 +415,6 @@ static int mes_v10_1_init_microcode(struct amdgpu_device *adev,

         mes_hdr = (const struct mes_firmware_header_v1_0 *)
                 adev->mes.fw[pipe]->data;
-       adev->mes.ucode_fw_version[pipe] =
-               le32_to_cpu(mes_hdr->mes_ucode_version);
-       adev->mes.ucode_fw_version[pipe] =
-               le32_to_cpu(mes_hdr->mes_ucode_data_version);
         adev->mes.uc_start_addr[pipe] =
                 le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) |
                 ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32);
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index e14f314902b1..27a330f51c7d 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -480,10 +480,6 @@ static int mes_v11_0_init_microcode(struct amdgpu_device *adev,

         mes_hdr = (const struct mes_firmware_header_v1_0 *)
                 adev->mes.fw[pipe]->data;
-       adev->mes.ucode_fw_version[pipe] =
-               le32_to_cpu(mes_hdr->mes_ucode_version);
-       adev->mes.ucode_fw_version[pipe] =
-               le32_to_cpu(mes_hdr->mes_ucode_data_version);
         adev->mes.uc_start_addr[pipe] =
                 le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) |
                 ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32);
--
2.25.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20221026/f3ecfeab/attachment.htm>