tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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@amd.com>
Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Graham Sider and committed by
Alex Deucher 6040517e 1d522b51

-10
-2
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
··· 91 91 struct amdgpu_bo *ucode_fw_obj[AMDGPU_MAX_MES_PIPES]; 92 92 uint64_t ucode_fw_gpu_addr[AMDGPU_MAX_MES_PIPES]; 93 93 uint32_t *ucode_fw_ptr[AMDGPU_MAX_MES_PIPES]; 94 - uint32_t ucode_fw_version[AMDGPU_MAX_MES_PIPES]; 95 94 uint64_t uc_start_addr[AMDGPU_MAX_MES_PIPES]; 96 95 97 96 /* mes ucode data */ 98 97 struct amdgpu_bo *data_fw_obj[AMDGPU_MAX_MES_PIPES]; 99 98 uint64_t data_fw_gpu_addr[AMDGPU_MAX_MES_PIPES]; 100 99 uint32_t *data_fw_ptr[AMDGPU_MAX_MES_PIPES]; 101 - uint32_t data_fw_version[AMDGPU_MAX_MES_PIPES]; 102 100 uint64_t data_start_addr[AMDGPU_MAX_MES_PIPES]; 103 101 104 102 /* eop gpu obj */
-4
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
··· 415 415 416 416 mes_hdr = (const struct mes_firmware_header_v1_0 *) 417 417 adev->mes.fw[pipe]->data; 418 - adev->mes.ucode_fw_version[pipe] = 419 - le32_to_cpu(mes_hdr->mes_ucode_version); 420 - adev->mes.ucode_fw_version[pipe] = 421 - le32_to_cpu(mes_hdr->mes_ucode_data_version); 422 418 adev->mes.uc_start_addr[pipe] = 423 419 le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) | 424 420 ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32);
-4
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
··· 485 485 486 486 mes_hdr = (const struct mes_firmware_header_v1_0 *) 487 487 adev->mes.fw[pipe]->data; 488 - adev->mes.ucode_fw_version[pipe] = 489 - le32_to_cpu(mes_hdr->mes_ucode_version); 490 - adev->mes.ucode_fw_version[pipe] = 491 - le32_to_cpu(mes_hdr->mes_ucode_data_version); 492 488 adev->mes.uc_start_addr[pipe] = 493 489 le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) | 494 490 ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32);