From: James Zhu <James.Zhu@amd.com>
Date: Mon, 6 Jul 2020 13:55:24 +0000 (-0400)
Subject: drm/amdgpu/jpeg: enable JPEG on aldebaran
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f8db121e471713c8b8ad56cde409abf2ef9a27bb;p=linux.git

drm/amdgpu/jpeg: enable JPEG on aldebaran

enable JPEG 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 a3185bc759506..6b1b2b379226b 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1080,6 +1080,7 @@ 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, &vcn_v2_5_ip_block);
+		amdgpu_device_ip_block_add(adev, &jpeg_v2_5_ip_block);
 		break;
 	default:
 		return -EINVAL;