1 files changed, 39 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3140-drm-amdgpu-only-allow-scatter-gather-display-with-DC.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3140-drm-amdgpu-only-allow-scatter-gather-display-with-DC.patch
new file mode 100644
index 00000000..a2962de2
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3140-drm-amdgpu-only-allow-scatter-gather-display-with-DC.patch
@@ -0,0 +1,39 @@
+From 0b92cad3b03a20de9315b5f10a093b4a8377bd0a Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 12 Jan 2018 14:56:49 -0500
+Subject: [PATCH 3140/4131] drm/amdgpu: only allow scatter/gather display with
+ DC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Check if DC is enabled before allowing scanout buffers
+to be pinned in system memory.
+
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+index c8c145e..b13839d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+@@ -512,9 +512,12 @@ uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)
+ {
+ 	uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM;
+ 
++#if defined(CONFIG_DRM_AMD_DC)
+ 	if (adev->asic_type >= CHIP_CARRIZO && adev->asic_type < CHIP_RAVEN &&
+-	    adev->flags & AMD_IS_APU)
++	    adev->flags & AMD_IS_APU &&
++	    amdgpu_device_asic_has_dc_support(adev->asic_type))
+ 		domain |= AMDGPU_GEM_DOMAIN_GTT;
++#endif
+ 
+ 	return domain;
+ }
+-- 
+2.7.4
+