drm/amdgpu: remove deprecated MES version vars

commit 6040517e4a29d3828160c571681eec9ffe10043f upstream.

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@amd.com>
Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
index ad980f4b66e19143899169cc83e19d0e7c1efdf7..97c05d08a551a3a06d2d3c185267700aa6a817d9 100644 (file)
--- 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 067d10073a562c65682d048cd5d0beadbf2a79a4..1abdf8b7ab50c6da519df654ae8b6875387a772f 100644 (file)
--- 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 6f0e389be5f6a3f2122a7782982140681f56501d..6552352a95ce50ba3ebed9131dcc91b15e77e470 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/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);