Commit da3b36a2 authored by Jane Jian's avatar Jane Jian Committed by Alex Deucher
Browse files

drm/amdgpu/sriov/vcn: add new vcn ip revision check case for SIENNA_CICHLID 



[WHY]
for sriov odd# vf will modify vcn0 engine ip revision(due to multimedia bandwidth feature),
which will be mismatched with original vcn0 revision

[HOW]
add new version check for vcn0 disabled revision(3, 0, 192), typically modified under
sriov mode

Signed-off-by: default avatarJane Jian <Jane.Jian@amd.com>
Reviewed-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 d58071a8

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

+1 −0
Original line number Diff line number Diff line
@@ -918,6 +918,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(3, 0, 64):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 0, 2):

		case IP_VERSION(3, 0, 192):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			if (!amdgpu_sriov_vf(adev))

				amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

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

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

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		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
@@ -183,6 +183,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):

	case IP_VERSION(3, 0, 192):

		if (amdgpu_sriov_vf(adev)) {

			if (encode)

				*codecs = &sriov_sc_video_codecs_encode;