1 files changed, 45 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0724-drm-amd-display-Add-surface-to-dm_plane_state-if-fb-.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0724-drm-amd-display-Add-surface-to-dm_plane_state-if-fb-.patch
new file mode 100644
index 00000000..0c9200a8
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0724-drm-amd-display-Add-surface-to-dm_plane_state-if-fb-.patch
@@ -0,0 +1,45 @@
+From cc6cc7c27ba8c791a71bddf2d064dd583bc38343 Mon Sep 17 00:00:00 2001
+From: Jerry Zuo <Jerry.Zuo@amd.com>
+Date: Thu, 27 Jul 2017 15:50:26 -0400
+Subject: [PATCH 0724/4131] drm/amd/display: Add surface to dm_plane_state if
+ fb reserve fails
+
+Signed-off-by: Jerry Zuo <Jerry.Zuo@amd.com>
+Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 0d42bd0..ce9136d 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4865,6 +4865,11 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
+ 
+ 				dc_plane_state = dc_create_plane_state(dc);
+ 
++				if (dm_plane_state->dc_state)
++					dc_plane_state_release(dm_plane_state->dc_state);
++
++				dm_plane_state->dc_state = dc_plane_state;
++
+ 				ret = fill_plane_attributes(
+ 					plane_crtc->dev->dev_private,
+ 					dc_plane_state,
+@@ -4874,12 +4879,6 @@ int amdgpu_dm_atomic_check(struct drm_device *dev,
+ 				if (ret)
+ 					goto fail;
+ 
+-
+-				if (dm_plane_state->dc_state)
+-					dc_plane_state_release(dm_plane_state->dc_state);
+-
+-				dm_plane_state->dc_state = dc_plane_state;
+-
+ 				add_val_sets_plane(set,
+ 						     set_count,
+ 						     new_acrtc_state->stream,
+-- 
+2.7.4
+