]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu: drop jpeg IP initialization in SRIOV case
authorGuchun Chen <guchun.chen@amd.com>
Wed, 10 Nov 2021 02:07:41 +0000 (10:07 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 10 Nov 2021 17:00:08 +0000 (12:00 -0500)
Fixes: b05b9c591f9ed6 ("drm/amdgpu: clean up set IP function")
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

index d7c8d9e3c2038a0a5865b56993827356a159eb4f..a20d21409c95fbc6c69d1d81bc47be01279beaeb 100644 (file)
@@ -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;