Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu/jpeg: Remove harvest checking on CHIP_YELLOW_CARP

Register CC_UVD_HARVESTING is obsolete on CHIP_YELLOW_CARP.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

James Zhu and committed by
Alex Deucher
3d417b58 3975cd8f

+6 -3
+6 -3
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
··· 49 49 static int jpeg_v3_0_early_init(void *handle) 50 50 { 51 51 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 52 - u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING); 53 52 54 - if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) 55 - return -ENOENT; 53 + if (adev->asic_type != CHIP_YELLOW_CARP) { 54 + u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING); 55 + 56 + if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) 57 + return -ENOENT; 58 + } 56 59 57 60 adev->jpeg.num_jpeg_inst = 1; 58 61