drm/amdgpu: disable vcn ip block for front door loading on Arcturus

Needs more work to enable via front door loading.

Signed-off-by: Le Ma <le.ma@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/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 588187615a2b2059ccd8c9e25c5e15ceb172f1b5..8655135e87d06cb8d1cc444e8e5253f1041fc4f9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -763,7 +763,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                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, &smu_v11_0_ip_block);
-               amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
+               if (unlikely(adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT))
+                       amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
                break;
        case CHIP_RENOIR:
                amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);