Commit f471de25 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: vcn_v4_0_3 load vcn fw once for all AIDs 



Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 52c293ab

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

+3 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,9 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev) 
			adev->firmware.ucode[idx].fw = adev->vcn.fw;

			adev->firmware.fw_size +=

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



			if (adev->ip_versions[UVD_HWIP][0] == IP_VERSION(4, 0, 3))

				break;

		}

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static int vcn_v4_0_3_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b 
		UVD_MASTINT_EN__VCPU_EN_MASK, 0, indirect);



	if (indirect)

		psp_update_vcn_sram(adev, inst_idx, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,

		psp_update_vcn_sram(adev, 0, adev->vcn.inst[inst_idx].dpg_sram_gpu_addr,

			(uint32_t)((uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_curr_addr -

				(uintptr_t)adev->vcn.inst[inst_idx].dpg_sram_cpu_addr));