[PATCH v6 28/43] drm/vkms: Properly render plane using their zpos
From: Louis Chauvet
Date: Fri Nov 20 2026 - 13:07:18 EST
Currently planes are rendered in creation order. This is not an issue, but
with the introduction of new zpos configuration, it is required to
properly render planes.
Reviewed-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>
Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_composer.c | 3 ++-
drivers/gpu/drm/vkms/vkms_crtc.c | 16 ++++++++--------
drivers/gpu/drm/vkms/vkms_drv.c | 2 ++
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 0fc915a954ba..6259017c5d69 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -505,7 +505,8 @@ static void blend(struct vkms_writeback_job *wb,
/* The active planes are composed associatively in z-order. */
for (size_t i = 0; i < n_active_planes; i++) {
- blend_line(plane[i], y, crtc_x_limit, stage_buffer, output_buffer);
+ if (plane[i])
+ blend_line(plane[i], y, crtc_x_limit, stage_buffer, output_buffer);
}
apply_lut(crtc_state, output_buffer);
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index fe17f49305a9..ffd1eb5f1976 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -133,9 +133,6 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
plane_state = drm_atomic_get_new_plane_state(crtc_state->state, plane);
WARN_ON(!plane_state);
- if (!plane_state->visible)
- continue;
-
i++;
}
@@ -144,15 +141,18 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
return -ENOMEM;
vkms_state->num_active_planes = i;
- i = 0;
drm_for_each_plane_mask(plane, crtc->dev, crtc_state->plane_mask) {
plane_state = drm_atomic_get_new_plane_state(crtc_state->state, plane);
+ /*
+ * normalized_zpos is computed by the DRM core and is unique
+ * in the range 0..n_planes-1: use it to index the array.
+ */
if (!plane_state->visible)
- continue;
-
- vkms_state->active_planes[i++] =
- to_vkms_plane_state(plane_state);
+ vkms_state->active_planes[plane_state->normalized_zpos] = NULL;
+ else
+ vkms_state->active_planes[plane_state->normalized_zpos] =
+ to_vkms_plane_state(plane_state);
}
return 0;
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index a4bc3d02a6cd..a60aa6bf6913 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -155,6 +155,8 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev)
dev->mode_config.preferred_depth = 0;
dev->mode_config.helper_private = &vkms_mode_config_helpers;
+ dev->mode_config.normalize_zpos = true;
+
return vkms_output_init(vkmsdev);
}
--
2.56.0