From 3a0492cae81b0552317ceda6e94a4c8f119cac1e Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:33 +0100 Subject: [PATCH] Revert "drm: komeda: Fix an issue related to normalized zpos" This reverts commit f98965500e90bed194b606973bbf9320a7b9b499. --- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index ac8b7fb20..1f6682032 100755 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -142,7 +142,6 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, struct drm_plane *plane; struct list_head zorder_list; int order = 0, err; - u32 slave_zpos = 0; DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n", crtc->base.id, crtc->name); @@ -182,13 +181,10 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, plane_st->zpos, plane_st->normalized_zpos); /* calculate max slave zorder */ - if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) { - slave_zpos = plane_st->normalized_zpos; - if (to_kplane_st(plane_st)->layer_split) - slave_zpos++; + if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) kcrtc_st->max_slave_zorder = - max(slave_zpos, kcrtc_st->max_slave_zorder); - } + max(plane_st->normalized_zpos, + kcrtc_st->max_slave_zorder); } crtc_st->zpos_changed = true;