summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/soc15.c
diff options
context:
space:
mode:
authorJames Zhu <James.Zhu@amd.com>2020-12-17 16:12:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2021-03-23 22:57:09 -0400
commitfdb1fdef2df48a740477791ac465b57cd3a0d71a (patch)
treec335e30827b8ad226e80701b13b7e2f339a1b64f /drivers/gpu/drm/amd/amdgpu/soc15.c
parentbd7228abb3b4c07fd898a620dfca2d072a8a89c4 (diff)
downloadlinux-stable-fdb1fdef2df48a740477791ac465b57cd3a0d71a.tar.gz
linux-stable-fdb1fdef2df48a740477791ac465b57cd3a0d71a.tar.bz2
linux-stable-fdb1fdef2df48a740477791ac465b57cd3a0d71a.zip
drm/amdgpu: enable vcn and jpeg on aldebaran
Enable vcn and jpeg 2.6 on aldebaran. Signed-off-by: James Zhu <James.Zhu@amd.com> Reviewed-by: Leo Liu <leo.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/soc15.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 4fd9b158f06c..2c3210342cad 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1062,8 +1062,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);
- /*amdgpu_device_ip_block_add(adev, &vcn_v2_5_ip_block);
- amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);*/
+ amdgpu_device_ip_block_add(adev, &vcn_v2_6_ip_block);
+ amdgpu_device_ip_block_add(adev, &jpeg_v2_6_ip_block);
break;
default:
return -EINVAL;