From d895cd5b5798c03260f889ad3172f80db4369580 Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Wed, 5 Apr 2017 12:02:45 -0400 Subject: [PATCH 0489/4131] drm/amd/display: Remove redundant member from amdgpu_plane. Signed-off-by: Andrey Grodzovsky Signed-off-by: Leo (Sunpeng) Li Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher Signed-off-by: Kalyan Alle --- 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(-) 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 1d085f8..55b3464 100644 --- 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(struct amdgpu_device *adev) 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; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index e6eaea9..12389d7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -1712,7 +1712,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, { int res = -EPERM; - switch (aplane->plane_type) { + switch (aplane->base.type) { case DRM_PLANE_TYPE_PRIMARY: aplane->base.format_default = true; @@ -1723,7 +1723,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, &dm_plane_funcs, rgb_formats, ARRAY_SIZE(rgb_formats), NULL, - aplane->plane_type, NULL); + aplane->base.type, NULL); break; case DRM_PLANE_TYPE_OVERLAY: res = drm_universal_plane_init( @@ -1733,7 +1733,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, &dm_plane_funcs, yuv_formats, ARRAY_SIZE(yuv_formats), NULL, - aplane->plane_type, NULL); + aplane->base.type, NULL); break; case DRM_PLANE_TYPE_CURSOR: res = drm_universal_plane_init( @@ -1743,7 +1743,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, &dm_plane_funcs, cursor_formats, ARRAY_SIZE(cursor_formats), NULL, - aplane->plane_type, NULL); + aplane->base.type, NULL); break; } -- 2.7.4