From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Date: Wed, 5 Apr 2017 12:02:45 -0400
Subject: drm/amd/display: Remove redundant member from amdgpu_plane.
Git-commit: 1605b3bef8454a8906333f7a0ca0fb177422100d
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: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c       |    2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1203,7 +1203,7 @@ int amdgpu_dm_initialize_drm_device(stru
 			DRM_ERROR("KMS: Failed to allocate surface\n");
 			goto fail_free_planes;
 		}
-		mode_info->planes[i]->plane_type = mode_info->plane_type[i];
+		mode_info->planes[i]->base.type = mode_info->plane_type[i];
 		if (amdgpu_dm_plane_init(dm, mode_info->planes[i], 0xff)) {
 			DRM_ERROR("KMS: Failed to initialize plane\n");
 			goto fail_free_planes;
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -1557,7 +1557,7 @@ int amdgpu_dm_plane_init(struct amdgpu_d
 {
 	int res = -EPERM;
 
-	switch (aplane->plane_type) {
+	switch (aplane->base.type) {
 	case DRM_PLANE_TYPE_PRIMARY:
 		aplane->base.format_default = true;
 
@@ -1568,7 +1568,7 @@ int amdgpu_dm_plane_init(struct amdgpu_d
 				&dm_plane_funcs,
 				rgb_formats,
 				ARRAY_SIZE(rgb_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 	case DRM_PLANE_TYPE_OVERLAY:
 		res = drm_universal_plane_init(
@@ -1578,7 +1578,7 @@ int amdgpu_dm_plane_init(struct amdgpu_d
 				&dm_plane_funcs,
 				yuv_formats,
 				ARRAY_SIZE(yuv_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 	case DRM_PLANE_TYPE_CURSOR:
 		res = drm_universal_plane_init(
@@ -1588,7 +1588,7 @@ int amdgpu_dm_plane_init(struct amdgpu_d
 				&dm_plane_funcs,
 				cursor_formats,
 				ARRAY_SIZE(cursor_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 	}