drm/amdgpu: enable Arcturus JPEG2.5 block
authorLeo Liu <leo.liu@amd.com>
Mon, 11 Nov 2019 15:33:57 +0000 (10:33 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Nov 2019 15:12:50 +0000 (10:12 -0500)
It also doen't care about FW loading type, so enabling it directly.

Signed-off-by: Leo Liu <leo.liu@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 b404b7a6e593b795a0fe4a0cfc2e27bbf9581ea5..689ffa6ede573a9e7209cf7b165b2f53a17e99fe 100644 (file)
@@ -69,6 +69,7 @@
 #include "vcn_v2_0.h"
 #include "jpeg_v2_0.h"
 #include "vcn_v2_5.h"
+#include "jpeg_v2_5.h"
 #include "dce_virtual.h"
 #include "mxgpu_ai.h"
 #include "amdgpu_smu.h"
@@ -804,6 +805,7 @@ 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);
                break;
        case CHIP_RENOIR:
                amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);