From: Guchun Chen Date: Wed, 10 Nov 2021 02:07:41 +0000 (+0800) Subject: drm/amdgpu: drop jpeg IP initialization in SRIOV case X-Git-Tag: v5.16-rc1~38^2~2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b45a36032dc7e8b4da1a0479978ca6bb03ac632d;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: drop jpeg IP initialization in SRIOV case Fixes: b05b9c591f9ed6 ("drm/amdgpu: clean up set IP function") Signed-off-by: Guchun Chen Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c index d7c8d9e3c2038..a20d21409c95f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -867,7 +867,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) case IP_VERSION(2, 0, 2): case IP_VERSION(2, 2, 0): amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); - amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block); + if (!amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block); break; case IP_VERSION(2, 0, 3): break;