Revert "Revert "drm/amd/display: Implement zpos property""
Subsystems (3)
PATCH 1/1 Revert "Revert "drm/amd/display: Implement zpos property""
This reverts commit 984612bd4649c91f12e9c7c7f9e914fdc8ba7d3f.
The problematic IGT test case (i.e. kms_atomic@plane-immutable-zpos) has been fixed as of commit cb77add45011 ("tests/kms_atomic: remove zpos < N-planes assert") to the IGT repo. So, reintroduce the reverted code.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +9 -0
@@ -1469,6 +1469,15 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,drm_plane_create_blend_mode_property (plane, blend_caps); } +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) { +drm_plane_create_zpos_immutable_property (plane,0 ); + }else if (plane->type ==DRM_PLANE_TYPE_OVERLAY ) { +unsigned int zpos =1 +drm_plane_index (plane); +drm_plane_create_zpos_property (plane, zpos,1 ,254 ); + }else if (plane->type ==DRM_PLANE_TYPE_CURSOR ) { +drm_plane_create_zpos_immutable_property (plane,255 ); + } + if (plane->type == DRM_PLANE_TYPE_PRIMARY && plane_cap && (plane_cap->pixel_format_support.nv12 ||
Signature · 1 line
2.41.0
Quoted 9 lines · Hamza Mahfooz
This reverts commit
984612bd4649c91f12e9c7c7f9e914fdc8ba7d3f.The problematic IGT test case (i.e. kms_atomic@plane-immutable-zpos) has been fixed as of commit
cb77add45011("tests/kms_atomic: remove zpos < N-planes assert") to the IGT repo. So, reintroduce the reverted code.
Quoted 27 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +9
-1@@ -1469,6 +1469,15 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,drm_plane_create_blend_mode_property (plane, blend_caps); } +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) { +drm_plane_create_zpos_immutable_property (plane,0 ); + }else if (plane->type ==DRM_PLANE_TYPE_OVERLAY ) { +unsigned int zpos =1 +drm_plane_index (plane); +drm_plane_create_zpos_property (plane, zpos,1 ,254 ); + }else if (plane->type ==DRM_PLANE_TYPE_CURSOR ) { +drm_plane_create_zpos_immutable_property (plane,255 ); + } + if (plane->type == DRM_PLANE_TYPE_PRIMARY && plane_cap && (plane_cap->pixel_format_support.nv12 || --2.41.0
Quoted 8 lines · Hamza Mahfooz
This reverts commit
984612bd4649c91f12e9c7c7f9e914fdc8ba7d3f.The problematic IGT test case (i.e. kms_atomic@plane-immutable-zpos) has been fixed as of commit
cb77add45011("tests/kms_atomic: remove zpos < N-planes assert") to the IGT repo. So, reintroduce the reverted code.
Thanks!
Quoted 27 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +9
-0@@ -1469,6 +1469,15 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,drm_plane_create_blend_mode_property (plane, blend_caps); } +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) { +drm_plane_create_zpos_immutable_property (plane,0 ); + }else if (plane->type ==DRM_PLANE_TYPE_OVERLAY ) { +unsigned int zpos =1 +drm_plane_index (plane); +drm_plane_create_zpos_property (plane, zpos,1 ,254 ); + }else if (plane->type ==DRM_PLANE_TYPE_CURSOR ) { +drm_plane_create_zpos_immutable_property (plane,255 ); + } + if (plane->type == DRM_PLANE_TYPE_PRIMARY && plane_cap && (plane_cap->pixel_format_support.nv12 ||Signature · 1 line
2.41.0