Commit 3d417b58 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu/jpeg: Remove harvest checking on CHIP_YELLOW_CARP 



Register CC_UVD_HARVESTING is obsolete on CHIP_YELLOW_CARP.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAaron Liu <aaron.liu@amd.com>
Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3975cd8f

drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c

+6 −3
Original line number Diff line number Diff line
@@ -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;



	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;