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>

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 4fd9b158f06cd8f13a98a203d70674d11c35813e..2c3210342cad4e053a6c7bb3a9a23b1610249521 100644 (file)
--- 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;