Commit 6040517e authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

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: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1d522b51

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/amd/amdgpu/mes_v10_1.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/amdgpu/mes_v11_0.c

+0 −4
Original line number Diff line number Diff line
@@ -485,10 +485,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);