UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andrey Grodzovsky 2017-04-05 12:02:45 -04:00 committed by Alex Deucher
parent 7db4dede64
commit 1605b3bef8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -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;

8
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
View File

@ -1557,7 +1557,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;
@ -1568,7 +1568,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);
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_display_manager *dm,
&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_display_manager *dm,
&dm_plane_funcs,
cursor_formats,
ARRAY_SIZE(cursor_formats),
NULL, aplane->plane_type, NULL);
NULL, aplane->base.type, NULL);
break;
}