Merge tag 'f2fs-for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[linux.git] / drivers / gpu / drm / amd / amdgpu / jpeg_v3_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
index bd77794315bc6bea0e90b35c65237fb6e542170c..01c242c5abc33d2ee1feee829de0b9b932fad858 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
@@ -49,10 +49,13 @@ static int jpeg_v3_0_set_powergating_state(void *handle,
 static int jpeg_v3_0_early_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-       u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);
 
-       if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
-               return -ENOENT;
+       if (adev->asic_type != CHIP_YELLOW_CARP) {
+               u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);
+
+               if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
+                       return -ENOENT;
+       }
 
        adev->jpeg.num_jpeg_inst = 1;