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 <christian.koenig@amd.com>
Signed-off-by: Horace Chen <horace.chen@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 854ca8d..06b2d18 100644 (file)
--- 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,