From: Nicholas Choi Date: Wed, 26 Jul 2023 18:22:09 +0000 (-0400) Subject: Revert "drm/amd/display: Implement zpos property" X-Git-Tag: v6.6.17~3937^2~9^2~159 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2066eb4efe0e7d2d329d6e6765ed637a523ac45;p=platform%2Fkernel%2Flinux-rpi.git Revert "drm/amd/display: Implement zpos property" This reverts commit 5b29369b5488d54e466ef7c6a2020a4efc1d854f. This patch causes IGT test case 'kms_atomic@plane-immutable-zpos' to fail on AMDGPU hardware. Cc: Joshua Ashton Signed-off-by: Nicholas Choi Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 2198df9..8eeca16 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -1468,15 +1468,6 @@ 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 ||