drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting

zming6666 · alexdeucher · commit cb4b02d7cac5 · 2017-11-01T23:37:00.000-04:00
Fixes init failures on polaris cards with harvested UVD.

Signed-off-by: Leo Liu &lt;leo.liu@amd.com&gt;
Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Cc: stable@vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ static int uvd_v6_0_early_init(void *handle)`
`93`	`93`	`{`
`94`	`94`	`struct amdgpu_device adev = (struct amdgpu_device )handle;`
`95`	`95`
	`96`	`+ if (!(adev->flags & AMD_IS_APU) &&`
	`97`	`+ (RREG32_SMC(ixCC_HARVEST_FUSES) & CC_HARVEST_FUSES__UVD_DISABLE_MASK))`
	`98`	`+ return -ENOENT;`
	`99`	`+`
`96`	`100`	`uvd_v6_0_set_ring_funcs(adev);`
`97`	`101`	`uvd_v6_0_set_irq_funcs(adev);`
`98`	`102`