Revert "drm: komeda: Fix an issue related to normalized zpos"
This reverts commit f98965500e
.
This commit is contained in:
parent
a07cc604fc
commit
3a0492cae8
1 changed files with 3 additions and 7 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue