Commit c082fbd6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.1-2022-12-01' of... 

Merge tag 'amd-drm-fixes-6.1-2022-12-01' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-12-01:

amdgpu:
- VCN fix for vangogh

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221201202015.5931-1-alexander.deucher@amd.com
parents 65a38825 9a8cc8ca

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

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		break;

	case IP_VERSION(3, 0, 2):

		fw_name = FIRMWARE_VANGOGH;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 16):

		fw_name = FIRMWARE_DIMGREY_CAVEFISH;