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

Commit 9cc06965 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Just two small patches for stable to fix the driver failing to load on polaris
cards with harvested VCE or UVD blocks.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: allow harvesting check for Polaris VCE
  drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting
parents 96ffbbf9 32bec2af

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

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ static int uvd_v6_0_early_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (!(adev->flags & AMD_IS_APU) &&

	    (RREG32_SMC(ixCC_HARVEST_FUSES) & CC_HARVEST_FUSES__UVD_DISABLE_MASK))

		return -ENOENT;



	uvd_v6_0_set_ring_funcs(adev);

	uvd_v6_0_set_irq_funcs(adev);

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;

	}

}