drm/amdgpu: enable VCN2.5 IP block for Arcturus

With default PSP FW loading

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: James Zhu <James.Zhu@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 25cfc636c7322f11b80c985d35c98f18484fc024..6c75021dda0f398dc16a7ef0b5a4022226179b00 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -772,8 +772,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                        if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP))
                                amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
                } else {
-                       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, &vcn_v2_5_ip_block);
                }
                if (!amdgpu_sriov_vf(adev))
                        amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);