Browse Source

drm/amd/display: Remove redundant member from amdgpu_plane.

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>
Andrey Grodzovsky 8 years ago
parent
commit
1605b3bef8

+ 1 - 1
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");
 			DRM_ERROR("KMS: Failed to allocate surface\n");
 			goto fail_free_planes;
 			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)) {
 		if (amdgpu_dm_plane_init(dm, mode_info->planes[i], 0xff)) {
 			DRM_ERROR("KMS: Failed to initialize plane\n");
 			DRM_ERROR("KMS: Failed to initialize plane\n");
 			goto fail_free_planes;
 			goto fail_free_planes;

+ 4 - 4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c

@@ -1557,7 +1557,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 {
 {
 	int res = -EPERM;
 	int res = -EPERM;
 
 
-	switch (aplane->plane_type) {
+	switch (aplane->base.type) {
 	case DRM_PLANE_TYPE_PRIMARY:
 	case DRM_PLANE_TYPE_PRIMARY:
 		aplane->base.format_default = true;
 		aplane->base.format_default = true;
 
 
@@ -1568,7 +1568,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 				&dm_plane_funcs,
 				&dm_plane_funcs,
 				rgb_formats,
 				rgb_formats,
 				ARRAY_SIZE(rgb_formats),
 				ARRAY_SIZE(rgb_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 		break;
 	case DRM_PLANE_TYPE_OVERLAY:
 	case DRM_PLANE_TYPE_OVERLAY:
 		res = drm_universal_plane_init(
 		res = drm_universal_plane_init(
@@ -1578,7 +1578,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 				&dm_plane_funcs,
 				&dm_plane_funcs,
 				yuv_formats,
 				yuv_formats,
 				ARRAY_SIZE(yuv_formats),
 				ARRAY_SIZE(yuv_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 		break;
 	case DRM_PLANE_TYPE_CURSOR:
 	case DRM_PLANE_TYPE_CURSOR:
 		res = drm_universal_plane_init(
 		res = drm_universal_plane_init(
@@ -1588,7 +1588,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 				&dm_plane_funcs,
 				&dm_plane_funcs,
 				cursor_formats,
 				cursor_formats,
 				ARRAY_SIZE(cursor_formats),
 				ARRAY_SIZE(cursor_formats),
-				NULL, aplane->plane_type, NULL);
+				NULL, aplane->base.type, NULL);
 		break;
 		break;
 	}
 	}