Commit e8ac9e93 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vcn3.0: handle harvesting in firmware setup 

Only enable firmware for the instance that is enabled.

v2: use AMDGPU_UCODE_ID_VCN + i

Fixes: 1b592d00 ("drm/amdgpu/vcn: remove manual instance setting")
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1743


Reviewed-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 33c6bd98

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

+8 −8
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static int vcn_v3_0_sw_init(void *handle) 
{

	struct amdgpu_ring *ring;

	int i, j, r;

	unsigned int idx;

	int vcn_doorbell_index = 0;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -133,14 +134,13 @@ static int vcn_v3_0_sw_init(void *handle) 
	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {

		const struct common_firmware_header *hdr;

		hdr = (const struct common_firmware_header *)adev->vcn.fw->data;

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);



		if (adev->vcn.num_vcn_inst == VCN_INSTANCES_SIENNA_CICHLID) {

			adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].ucode_id = AMDGPU_UCODE_ID_VCN1;

			adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].fw = adev->vcn.fw;

		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {

			if (adev->vcn.harvest_config & (1 << i))

				continue;

			idx = AMDGPU_UCODE_ID_VCN + i;

			adev->firmware.ucode[idx].ucode_id = idx;

			adev->firmware.ucode[idx].fw = adev->vcn.fw;

			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		}