Commit aca670e4 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: fix the fw size for sdma 



For SDMA, if use the total size of SDMA TH0 and TH1 to allocate fw BO
may result to the ucode data overflow when copy ucode to BO as the PAGE
alignment.
IMU have the same issue.
Fix the above issue by alignment the fw size per fw ID.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a76be7bb

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

+2 −2
Original line number Diff line number Diff line
@@ -688,12 +688,12 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, 
	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {

		switch (ucode->ucode_id) {

		case AMDGPU_UCODE_ID_SDMA_UCODE_TH0:

			ucode->ucode_size = le32_to_cpu(sdma_hdr->ctx_jt_offset + sdma_hdr->ctx_jt_size);

			ucode->ucode_size = le32_to_cpu(sdma_hdr->ctx_ucode_size_bytes);

			ucode_addr = (u8 *)ucode->fw->data +

				le32_to_cpu(sdma_hdr->header.ucode_array_offset_bytes);

			break;

		case AMDGPU_UCODE_ID_SDMA_UCODE_TH1:

			ucode->ucode_size = le32_to_cpu(sdma_hdr->ctl_jt_offset + sdma_hdr->ctl_jt_size);

			ucode->ucode_size = le32_to_cpu(sdma_hdr->ctl_ucode_size_bytes);

			ucode_addr = (u8 *)ucode->fw->data +

				le32_to_cpu(sdma_hdr->ctl_ucode_offset);

			break;