2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 3632854c2b91..ef3b0e3571ec 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -319,6 +319,9 @@ static int omap_modeset_init(struct drm_device *dev)
         dev->mode_config.max_width = 8192;
         dev->mode_config.max_height = 8192;
 
+        /* We want the zpos to be normalized */
+        dev->mode_config.normalize_zpos = true;
+
         dev->mode_config.funcs = &omap_mode_config_funcs;
         dev->mode_config.helper_private = &omap_mode_config_helper_funcs;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 2899435cad6e..161233cbc9a0 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -65,7 +65,7 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
         info.rotation_type = OMAP_DSS_ROT_NONE;
         info.rotation = DRM_MODE_ROTATE_0;
         info.global_alpha = 0xff;
-        info.zorder = state->zpos;
+        info.zorder = state->normalized_zpos;
 
         /* update scanout: */
         omap_framebuffer_update_scanout(state->fb, state, &info);