From: Horace Chen Date: Thu, 21 Jul 2022 08:25:17 +0000 (+0800) Subject: drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0 X-Git-Tag: block-6.1-2022-13-10~35^2~16^2~24 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=dc5f3829a752bb579f709c604fa2f362959ca2b4;p=linux-block.git drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0 SRIOV needs to initialize mmsch instead of multimedia engines directly. So currently remove them for SR-IOV until the code and firmwares are ready. Acked-by: Christian König Signed-off-by: Horace Chen Reviewed-by: Hawking Zhang 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 854ca8d4505b..06b2d1830091 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -1908,8 +1908,10 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) case IP_VERSION(4, 0, 0): case IP_VERSION(4, 0, 2): case IP_VERSION(4, 0, 4): - amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block); - amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block); + if (!amdgpu_sriov_vf(adev)) { + amdgpu_device_ip_block_add(adev, &vcn_v4_0_ip_block); + amdgpu_device_ip_block_add(adev, &jpeg_v4_0_ip_block); + } break; default: dev_err(adev->dev,