summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-03-11 21:11:20 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-13 15:44:44 -0700
commitb66848eb85c2a646c852ea4644f43e1a86517245 (patch)
tree87e584be899fcf27ce8f0df2825472a82e4ff871 /drivers/staging
parent4d3bfdda15d2019a3c2c91c9043ee4c3f5627708 (diff)
downloadlinux-b66848eb85c2a646c852ea4644f43e1a86517245.tar.bz2
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/omapdrm/omap_plane.c2
1 files changed, 1 insertions, 1 deletions
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);