Commit 4d395f93 authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: add missed support for UVD IP_VERSION(3, 0, 64) 



Fixes: 96b8dd44 ("drm/amdgpu/amdgpu_vcn: convert to IP version checking")
Signed-off-by: default avatarFlora Cui <flora.cui@amd.com>
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b45a3603

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

+1 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
			break;

		case IP_VERSION(3, 0, 0):

		case IP_VERSION(3, 0, 16):

		case IP_VERSION(3, 0, 64):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 0, 2):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

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

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))

			fw_name = FIRMWARE_SIENNA_CICHLID;

		else

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

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode, 
{

	switch (adev->ip_versions[UVD_HWIP][0]) {

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

		if (amdgpu_sriov_vf(adev)) {

			if (encode)

				*codecs = &sriov_sc_video_codecs_encode;