drm/amdgpu: remove deprecated MES version vars

From Graham Sider
369b891842228e18821e17ce5dbafc99d37d8a5d in linux-6.1.y/6.1.29
6040517e4a29d3828160c571681eec9ffe10043f in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.h
index a1869c3..6999d35 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.h
+++ b/sys/dev/pci/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/sys/dev/pci/drm/amd/amdgpu/mes_v10_1.c b/sys/dev/pci/drm/amd/amdgpu/mes_v10_1.c
index 332185c..863ed6b 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/mes_v10_1.c
+++ b/sys/dev/pci/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/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c
index 8ef6cbb..e3f1fa0 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/mes_v11_0.c
@@ -484,10 +484,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);