Commit 5be45a26 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher

drm/amdgpu: enable JPEG2.0 for Navi1x and Renoir

By adding JPEG IP block to the family
Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 52f2e779
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include "gfx_v10_0.h" #include "gfx_v10_0.h"
#include "sdma_v5_0.h" #include "sdma_v5_0.h"
#include "vcn_v2_0.h" #include "vcn_v2_0.h"
#include "jpeg_v2_0.h"
#include "dce_virtual.h" #include "dce_virtual.h"
#include "mes_v10_1.h" #include "mes_v10_1.h"
#include "mxgpu_nv.h" #include "mxgpu_nv.h"
...@@ -456,6 +457,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) ...@@ -456,6 +457,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev))
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);
amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);
if (adev->enable_mes) if (adev->enable_mes)
amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block); amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block);
break; break;
...@@ -479,6 +481,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) ...@@ -479,6 +481,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev))
amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);
amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);
break; break;
default: default:
return -EINVAL; return -EINVAL;
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
#include "vce_v4_0.h" #include "vce_v4_0.h"
#include "vcn_v1_0.h" #include "vcn_v1_0.h"
#include "vcn_v2_0.h" #include "vcn_v2_0.h"
#include "jpeg_v2_0.h"
#include "vcn_v2_5.h" #include "vcn_v2_5.h"
#include "dce_virtual.h" #include "dce_virtual.h"
#include "mxgpu_ai.h" #include "mxgpu_ai.h"
...@@ -821,6 +822,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) ...@@ -821,6 +822,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &dm_ip_block); amdgpu_device_ip_block_add(adev, &dm_ip_block);
#endif #endif
amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);
amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);
break; break;
default: default:
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment