]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: Exclude MM engines for vega20 virtual device
authorFrank Min <Frank.Min@amd.com>
Thu, 26 Apr 2018 19:45:50 +0000 (03:45 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 20 Sep 2018 03:32:29 +0000 (22:32 -0500)
Temporary disable UVD/VCE block if is virtual device

Signed-off-by: Frank Min <Frank.Min@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/soc15.c

index c4daf1f93486fa8e7ef299e8ff1e0aa7a6255aca..138c4810a3ded81707e21e802a9b5c770fa539d1 100644 (file)
@@ -541,8 +541,10 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 #endif
                amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
-               amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
-               amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
+               if (!(adev->asic_type == CHIP_VEGA20 && amdgpu_sriov_vf(adev))) {
+                       amdgpu_device_ip_block_add(adev, &uvd_v7_0_ip_block);
+                       amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
+               }
                break;
        case CHIP_RAVEN:
                amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);