summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>2023-05-09 10:07:50 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-17 14:59:06 +0300
commit57f8f99dfda7644878c1e4cdb2940b0a5a752687 (patch)
tree94fb076d73adca5d97d8b818dc07ef9d2fff2be3
parent3d28af21a874c5123d1681c2d686627f7ff7e488 (diff)
downloadlinux-57f8f99dfda7644878c1e4cdb2940b0a5a752687.tar.xz
drm/amdgpu/jpeg: Remove harvest checking for JPEG3
commit 5b94db73e45e2e6c2840f39c022fd71dfa47fc58 upstream. Register CC_UVD_HARVESTING is obsolete for JPEG 3.1.2 Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com> Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 6.1.x Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
index a1b751d9ac06..323d68b2124f 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
@@ -54,6 +54,7 @@ static int jpeg_v3_0_early_init(void *handle)
switch (adev->ip_versions[UVD_HWIP][0]) {
case IP_VERSION(3, 1, 1):
+ case IP_VERSION(3, 1, 2):
break;
default:
harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);