mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
Revert "Revert "drm/amd/display: Implement zpos property""
This reverts commite2066eb4ef
. 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. Link:cb77add450
Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Melissa Wen <mwen@igalia.com> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
bf227a4f05
commit
fe320639c1
1 changed files with 9 additions and 0 deletions
|
@ -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 ||
|
||||
|
|
Loading…
Add table
Reference in a new issue