Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32bec2af authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: allow harvesting check for Polaris VCE 



Fixes init failures on Polaris cards with harvested
VCE blocks.

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent cb4b02d7

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

+6 −6
Original line number Diff line number Diff line
@@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) 
{

	u32 tmp;



	/* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */

	if ((adev->asic_type == CHIP_FIJI) ||

	    (adev->asic_type == CHIP_STONEY) ||

	    (adev->asic_type == CHIP_POLARIS10) ||

	    (adev->asic_type == CHIP_POLARIS11) ||

	    (adev->asic_type == CHIP_POLARIS12))

	    (adev->asic_type == CHIP_STONEY))

		return AMDGPU_VCE_HARVEST_VCE1;



	/* Tonga and CZ are dual or single pipe */

	if (adev->flags & AMD_IS_APU)

		tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) &

		       VCE_HARVEST_FUSE_MACRO__MASK) >>
@@ -391,6 +386,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) 
	case 3:

		return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;

	default:

		if ((adev->asic_type == CHIP_POLARIS10) ||

		    (adev->asic_type == CHIP_POLARIS11) ||

		    (adev->asic_type == CHIP_POLARIS12))

			return AMDGPU_VCE_HARVEST_VCE1;



		return 0;

	}

}