drm/amd/amdgpu/sriov skip jpeg ip block for ARCTURUS VF
authorJack Zhang <Jack.Zhang1@amd.com>
Tue, 26 Nov 2019 06:47:29 +0000 (14:47 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 26 Nov 2019 19:51:03 +0000 (14:51 -0500)
Currently ARCTURUS VF doesn't support jpeg ip block.
Skip jpeg ip block in case guest driver load fail.

Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com>
Reviewed-by: Zhexi Zhang <zhexi.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/soc15.c

index 951327f..48649f5 100644 (file)
@@ -834,7 +834,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
 
                if (unlikely(adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT))
                        amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
-               amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);
+               if (!amdgpu_sriov_vf(adev))
+                       amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);
                break;
        case CHIP_RENOIR:
                amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);