]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu/jpeg: Remove harvest checking for JPEG3
authorSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Tue, 9 May 2023 07:07:50 +0000 (12:37 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:53:50 +0000 (11:53 +0200)
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>
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c

index a1b751d9ac06467c1043f271516d0fa409990aac..323d68b2124fa775a5e6887da293f69e17b35e6a 100644 (file)
@@ -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);