1 files changed, 52 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0547-drm-amd-display-Move-dm_plane_state-definition-to-DA.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0547-drm-amd-display-Move-dm_plane_state-definition-to-DA.patch
new file mode 100644
index 00000000..0f124583
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0547-drm-amd-display-Move-dm_plane_state-definition-to-DA.patch
@@ -0,0 +1,52 @@
+From a8810e66260bc4305525e80b369379ac145e9b14 Mon Sep 17 00:00:00 2001
+From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Date: Wed, 28 Jun 2017 11:03:11 -0400
+Subject: [PATCH 0547/4131] drm/amd/display: Move dm_plane_state definition to
+ DAL header.
+
+Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h                | 8 --------
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h | 6 ++++++
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+index e6eeb67..9589d33 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+@@ -446,14 +446,6 @@ struct amdgpu_crtc {
+ 	struct drm_pending_vblank_event *event;
+ };
+ 
+-/* TODO rename to dc_plane_state */
+-struct  dc_surface;
+-
+-struct dm_plane_state {
+-	struct drm_plane_state base;
+-	struct  dc_surface* dc_surface;
+-};
+-
+ struct amdgpu_plane {
+ 	struct drm_plane base;
+ 	enum drm_plane_type plane_type;
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
+index b69c868..6411dd1 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.h
+@@ -33,6 +33,12 @@ struct amdgpu_display_manager;
+ struct dc_validation_set;
+ struct dc_surface;
+ 
++struct dm_plane_state {
++	struct drm_plane_state base;
++	struct dc_surface *dc_surface;
++};
++
++
+ /*TODO Jodan Hersen use the one in amdgpu_dm*/
+ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
+ 			struct amdgpu_plane *aplane,
+-- 
+2.7.4
+