2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index e2e935813cc4..932e96b75528 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -178,8 +178,10 @@ cleanup:
 static int omap_modeset_init_properties(struct drm_device *dev)
 {
         struct omap_drm_private *priv = dev->dev_private;
+        unsigned int num_planes = priv->dispc_ops->get_num_ovls();
 
-        priv->zorder_prop = drm_property_create_range(dev, 0, "zorder", 0, 3);
+        priv->zorder_prop = drm_property_create_range(dev, 0, "zorder", 0,
+                                                      num_planes - 1);
         if (!priv->zorder_prop)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 334ee431c981..a55e7db7e445 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -291,6 +291,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
                 u32 possible_crtcs)
 {
         struct omap_drm_private *priv = dev->dev_private;
+        unsigned int num_planes = priv->dispc_ops->get_num_ovls();
         struct drm_plane *plane;
         struct omap_plane *omap_plane;
         enum omap_plane_id id;
@@ -324,6 +325,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         drm_plane_helper_add(plane, &omap_plane_helper_funcs);
 
         omap_plane_install_properties(plane, &plane->base);
+        drm_plane_create_zpos_property(plane, 0, 0, num_planes - 1);
 
         return plane;