Patch "drm/amdgpu: allow harvesting check for Polaris VCE" has been added to the 4.13-stable tree

This is a note to let you know that I've just added the patch titled

drm/amdgpu: allow harvesting check for Polaris VCE

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-amdgpu-allow-harvesting-check-for-polaris-vce.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Leo Liu <[email protected]>
Date: Tue, 31 Oct 2017 21:12:35 -0400
Subject: drm/amdgpu: allow harvesting check for Polaris VCE

From: Leo Liu <[email protected]>

commit 32bec2afa525149288e6696079bc85f747fa2138 upstream.

Fixes init failures on Polaris cards with harvested VCE blocks.

---
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

@@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_con
 {
 	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_con
 	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;
 	}
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/drm-amdgpu-allow-harvesting-check-for-polaris-vce.patch queue-4.13/drm-amdgpu-return-enoent-from-uvd-6.0-early-init-for-harvesting.patch