From: Rob Clark <rob@ti.com>
Date: Mon, 12 Mar 2012 02:11:20 +0000 (-0500)
Subject: staging: drm/omap: avoid multiple planes having same z-order
X-Git-Tag: MMI-PSA29.97-13-9~17268^2~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b66848eb85c2a646c852ea4644f43e1a86517245;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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 55ddc580fe68..9b3bfa02a91c 100644
--- 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);