From: Andrey Grodzovsky <[email protected]>
Change-Id: I074023eba6cec3ae1a1c06f2b4472abc7826df61
Signed-off-by: Andrey Grodzovsky <[email protected]>
Signed-off-by: Leo (Sunpeng) Li <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
---
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 c26bf362cc57..3fb6a6583309 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1209,7 +1209,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 75102fd1f1f7..37b2c61fb2fb 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
@@ -1728,7 +1728,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;
@@ -1739,7 +1739,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager
*dm,
&dm_plane_funcs,
rgb_formats,
ARRAY_SIZE(rgb_formats),
- aplane->plane_type, NULL);
+ aplane->base.type, NULL);
break;
case DRM_PLANE_TYPE_OVERLAY:
res = drm_universal_plane_init(
@@ -1749,7 +1749,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager
*dm,
&dm_plane_funcs,
yuv_formats,
ARRAY_SIZE(yuv_formats),
- aplane->plane_type, NULL);
+ aplane->base.type, NULL);
break;
case DRM_PLANE_TYPE_CURSOR:
res = drm_universal_plane_init(
@@ -1759,7 +1759,7 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager
*dm,
&dm_plane_funcs,
cursor_formats,
ARRAY_SIZE(cursor_formats),
- aplane->plane_type, NULL);
+ aplane->base.type, NULL);
break;
}
--
2.11.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
