diff options
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c index bd77794315bc..01c242c5abc3 100644 --- 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; | 
