From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Date: Wed, 28 Jun 2017 11:03:11 -0400
Subject: drm/amd/display: Move dm_plane_state definition to DAL header.
Git-commit: cf5a4c11a1561db5c31a2783611aa6d5dbb67225
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.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(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -442,14 +442,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;
--- 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,