aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2012-06-04 17:25:17 -0700
committerGerrit Code Review <gerrit2@git.omapzoom.org>2012-10-17 05:35:26 -0500
commite67f0202e3ec0fc8cb3338ab935c0d6ead224ea9 (patch)
tree5c7c005861823e9314a40d17dad9306e28c3e81e /drivers/video/omap2
parent2d32240422582ee6b83119c81fb189baa8bc3075 (diff)
downloadkernel_samsung_espresso10-e67f0202e3ec0fc8cb3338ab935c0d6ead224ea9.zip
kernel_samsung_espresso10-e67f0202e3ec0fc8cb3338ab935c0d6ead224ea9.tar.gz
kernel_samsung_espresso10-e67f0202e3ec0fc8cb3338ab935c0d6ead224ea9.tar.bz2
OMAP4: OMAPFB: Set overlay zorder to 0 if omapfb API used
Since there's no ioctl to set zorder when modifying overlays using SETUP_PLANE, it's more useful to userland code if overlay is 0, so they don't have to use sysfs and first figure out which overlay is being used by omapfb. Change-Id: I1c2eeecb0b950439e40eec895d6b89c73df2fd7e Signed-off-by: Mike J. Chen <mjchen@google.com> Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 7e400f0..fc576e3 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1017,6 +1017,11 @@ int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
if (!info.min_y_decim)
info.min_y_decim = 1;
+ /*
+ * If fb is used directly, set zorder to 0
+ */
+ info.zorder = 0;
+
r = ovl->set_overlay_info(ovl, &info);
if (r) {
DBG("ovl->setup_overlay_info failed\n");