aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorGuchun Chen <guchun.chen@amd.com>2021-11-10 10:07:41 +0800
committerAlex Deucher <alexander.deucher@amd.com>2021-11-10 12:00:08 -0500
commitb45a36032dc7e8b4da1a0479978ca6bb03ac632d (patch)
treeeca9fdd01bba2b86041eab4ec01a3426c1cb0d65 /drivers/gpu
parentdrm/amd/display: reject both non-zero src_x and src_y only for DCN1x (diff)
downloadlinux-dev-b45a36032dc7e8b4da1a0479978ca6bb03ac632d.tar.xz
linux-dev-b45a36032dc7e8b4da1a0479978ca6bb03ac632d.zip
drm/amdgpu: drop jpeg IP initialization in SRIOV case
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index d7c8d9e3c203..a20d21409c95 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;