From: notaz <notasas@gmail.com>
Date: Sat, 2 Feb 2013 21:37:43 +0000 (+0200)
Subject: delay omapfb layer enable
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3af567bec0b9f4c99170d5cff7045f2a79da131b;p=sdl_omap.git

delay omapfb layer enable

fixes issues with tvout (I think)
---

diff --git a/src/video/omapdss/osdl_video.c b/src/video/omapdss/osdl_video.c
index 56c5485..fe9a29c 100644
--- a/src/video/omapdss/osdl_video.c
+++ b/src/video/omapdss/osdl_video.c
@@ -107,6 +107,19 @@ static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
 	return 0;
 }
 
+static int osdl_setup_omapfb_enable(struct omapfb_state *ostate,
+	int fd, int enabled)
+{
+	int ret;
+
+	ostate->pi.enabled = enabled;
+	ret = ioctl(fd, OMAPFB_SETUP_PLANE, &ostate->pi);
+	if (ret != 0)
+		err_perror("SETUP_PLANE");
+
+	return ret;
+}
+
 static int read_sysfs(const char *fname, char *buff, size_t size)
 {
 	FILE *f;
@@ -340,7 +353,7 @@ static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata,
 
 	x = screen_w / 2 - w / 2;
 	y = screen_h / 2 - h / 2;
-	ret = osdl_setup_omapfb(pdata->saved_layer, fd, 1, x, y, w, h,
+	ret = osdl_setup_omapfb(pdata->saved_layer, fd, 0, x, y, w, h,
 				width * height * ((bpp + 7) / 8), buffer_count);
 	if (ret == 0) {
 		pdata->layer_x = x;
@@ -406,6 +419,13 @@ void *osdl_video_set_mode(struct SDL_PrivateVideoData *pdata,
 		}
 	}
 
+	ret = osdl_setup_omapfb_enable(pdata->saved_layer,
+		vout_fbdev_get_fd(pdata->fbdev), 1);
+	if (ret != 0) {
+		err("layer enable failed");
+		goto fail;
+	}
+
 	if (buffers_try != buffers_set) {
 		log("only %d/%d buffers available, expect tearing\n",
 			buffers_set, buffers_try);