staging: drm/omap: avoid multiple planes having same z-order

Multiple video pipes on same output with same z-order is an undefined
behavior.  Set a unique z-order value based on overlay number/id.

Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/omapdrm/omap_plane.c b/drivers/staging/omapdrm/omap_plane.c
index 55ddc580fe68037dfec3b2430f2d9d50f9ee22e1..9b3bfa02a91c51b9a4e3f81df775d93f1c0c6117 100644 (file)
--- a/drivers/staging/omapdrm/omap_plane.c
+++ b/drivers/staging/omapdrm/omap_plane.c
@@ -439,7 +439,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
        if (priv)
                omap_plane->info.zorder = 0;
        else
-               omap_plane->info.zorder = 1;
+               omap_plane->info.zorder = ovl->id;
 
        update_manager(plane);