Commit 8fda90e8 authored by John Clements's avatar John Clements Committed by Alex Deucher
Browse files

drm/amdgpu: disable MEC2 JT context init for Arcturus 



We don't need to handle it like other asics.

Signed-off-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6c37bde9

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

+11 −5
Original line number Diff line number Diff line
@@ -1286,11 +1286,17 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 
			cp_hdr = (const struct gfx_firmware_header_v1_0 *)info->fw->data;

			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(header->ucode_size_bytes) - le32_to_cpu(cp_hdr->jt_size) * 4, PAGE_SIZE);



			/* TODO: Determine if MEC2 JT FW loading can be removed

				 for all GFX V9 asic and above */

			if (adev->asic_type != CHIP_ARCTURUS) {

				info = &adev->firmware.ucode[AMDGPU_UCODE_ID_CP_MEC2_JT];

				info->ucode_id = AMDGPU_UCODE_ID_CP_MEC2_JT;

				info->fw = adev->gfx.mec2_fw;

				adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(cp_hdr->jt_size) * 4, PAGE_SIZE);

					ALIGN(le32_to_cpu(cp_hdr->jt_size) * 4,

					PAGE_SIZE);

			}

		}

	}