* [PATCH] Revert "Revert "drm/amd/display: Implement zpos property""
@ 2023-08-29 11:39 Hamza Mahfooz
2023-08-29 14:09 ` Alex Deucher
2023-08-29 14:16 ` Melissa Wen
0 siblings, 2 replies; 3+ messages in thread
From: Hamza Mahfooz @ 2023-08-29 11:39 UTC (permalink / raw)
To: amd-gfx
Cc: Hamza Mahfooz, Harry Wentland, Leo Li, Rodrigo Siqueira,
Alex Deucher, Christian König, Pan, Xinhui, David Airlie,
Daniel Vetter, Qingqing Zhuo, Bas Nieuwenhuizen,
Joaquín Ignacio Aramendía, Joshua Ashton,
Nicholas Choi, David Tadokoro, Bhawanpreet Lakha, dri-devel,
linux-kernel
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.
Link: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/cb77add45011b129e21f3cb2a4089a73dde56179
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++
1 file changed, 9 insertions(+)
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 894bc7e4fdaa..df568a7cd005 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
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "Revert "drm/amd/display: Implement zpos property""
2023-08-29 11:39 [PATCH] Revert "Revert "drm/amd/display: Implement zpos property"" Hamza Mahfooz
@ 2023-08-29 14:09 ` Alex Deucher
2023-08-29 14:16 ` Melissa Wen
1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2023-08-29 14:09 UTC (permalink / raw)
To: Hamza Mahfooz
Cc: amd-gfx, dri-devel, Leo Li, Qingqing Zhuo, Pan, Xinhui,
Rodrigo Siqueira, linux-kernel,
Joaquín Ignacio Aramendía, David Tadokoro,
Bhawanpreet Lakha, Nicholas Choi, Alex Deucher,
Christian König, Joshua Ashton
On Tue, Aug 29, 2023 at 7:40 AM Hamza Mahfooz <hamza.mahfooz@amd.com> wrote:
>
> 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.
>
> Link: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/cb77add45011b129e21f3cb2a4089a73dde56179
> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> 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 894bc7e4fdaa..df568a7cd005 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
> @@ -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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "Revert "drm/amd/display: Implement zpos property""
2023-08-29 11:39 [PATCH] Revert "Revert "drm/amd/display: Implement zpos property"" Hamza Mahfooz
2023-08-29 14:09 ` Alex Deucher
@ 2023-08-29 14:16 ` Melissa Wen
1 sibling, 0 replies; 3+ messages in thread
From: Melissa Wen @ 2023-08-29 14:16 UTC (permalink / raw)
To: Hamza Mahfooz
Cc: amd-gfx, dri-devel, Leo Li, Qingqing Zhuo, Pan, Xinhui,
Rodrigo Siqueira, linux-kernel,
Joaquín Ignacio Aramendía, David Tadokoro,
Bhawanpreet Lakha, Nicholas Choi, Alex Deucher,
Christian König, Joshua Ashton
[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]
On 08/29, Hamza Mahfooz wrote:
> 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.
>
> Link: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/cb77add45011b129e21f3cb2a4089a73dde56179
> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Reviewed-by: Melissa Wen <mwen@igalia.com>
Thanks!
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> 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 894bc7e4fdaa..df568a7cd005 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
> @@ -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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-29 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-29 11:39 [PATCH] Revert "Revert "drm/amd/display: Implement zpos property"" Hamza Mahfooz
2023-08-29 14:09 ` Alex Deucher
2023-08-29 14:16 ` Melissa Wen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®