X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Flinux%2Ffbdev.c;h=d39263c87f38f9ac669e30b0af7ba8dc868164ca;hb=d45df001413d714c8995e755f04c9936b18aa44a;hp=9d532a532d02dd15392d90f873020aea894100de;hpb=f9b3f440374c61339a12046b226066658e313065;p=sdl_omap.git

diff --git a/src/video/omapdss/linux/fbdev.c b/src/video/omapdss/linux/fbdev.c
index 9d532a5..d39263c 100644
--- a/src/video/omapdss/linux/fbdev.c
+++ b/src/video/omapdss/linux/fbdev.c
@@ -22,6 +22,12 @@
 
 #include "fbdev.h"
 
+#define PFX "fbdev: "
+
+#ifndef OMAPFB_WAITFORVSYNC_FRAME
+#define OMAPFB_WAITFORVSYNC_FRAME _IOWR('O', 70, int)
+#endif
+
 struct vout_fbdev {
 	int	fd;
 	void	*mem;
@@ -32,6 +38,10 @@ struct vout_fbdev {
 	int	fb_size;
 	int	buffer_count;
 	int	top_border, bottom_border;
+	void	*mem_saved;
+	size_t	mem_saved_size;
+	unsigned long vsync_ioctl;
+	int	vsync_arg;
 };
 
 void *vout_fbdev_flip(struct vout_fbdev *fbdev)
@@ -57,8 +67,8 @@ void *vout_fbdev_flip(struct vout_fbdev *fbdev)
 
 void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
 {
-	int arg = 0;
-	ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &arg);
+	if (fbdev->vsync_ioctl != 0)
+		ioctl(fbdev->fd, fbdev->vsync_ioctl, &fbdev->vsync_arg);
 }
 
 /* it is recommended to call vout_fbdev_clear() before this */
@@ -83,7 +93,7 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 	{
 		if (fbdev->fbvar_new.bits_per_pixel != bpp ||
 				w != fbdev->fbvar_new.xres || h != fbdev->fbvar_new.yres)
-			printf(" switching to %dx%d@%d\n", w, h, bpp);
+			printf(PFX "switching to %dx%d@%d\n", w, h, bpp);
 
 		fbdev->fbvar_new.xres = w;
 		fbdev->fbvar_new.yres = h;
@@ -94,7 +104,7 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 		fbdev->fbvar_new.bits_per_pixel = bpp;
 		fbdev->fbvar_new.nonstd = 0; // can set YUV here on omapfb
 		fbdev->buffer_count = buffer_cnt;
-		fbdev->buffer_write = 1;
+		fbdev->buffer_write = buffer_cnt > 1 ? 1 : 0;
 
 		// seems to help a bit to avoid glitches
 		vout_fbdev_wait_vsync(fbdev);
@@ -105,12 +115,12 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 			fbdev->fbvar_new.yres_virtual = h_total;
 			ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
 			if (ret == -1) {
-				perror("FBIOPUT_VSCREENINFO ioctl");
+				perror(PFX "FBIOPUT_VSCREENINFO ioctl");
 				return NULL;
 			}
 			fbdev->buffer_count = 1;
 			fbdev->buffer_write = 0;
-			fprintf(stderr, "Warning: failed to increase virtual resolution, "
+			fprintf(stderr, PFX "Warning: failed to increase virtual resolution, "
 					"multibuffering disabled\n");
 		}
 
@@ -129,7 +139,7 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 
 	fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
 	if (fbdev->mem == MAP_FAILED && fbdev->buffer_count > 1) {
-		fprintf(stderr, "Warning: can't map %zd bytes, doublebuffering disabled\n", mem_size);
+		fprintf(stderr, PFX "Warning: can't map %zd bytes, doublebuffering disabled\n", mem_size);
 		fbdev->buffer_count = 1;
 		fbdev->buffer_write = 0;
 		mem_size = fbdev->fb_size;
@@ -138,7 +148,7 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 	if (fbdev->mem == MAP_FAILED) {
 		fbdev->mem = NULL;
 		fbdev->mem_size = 0;
-		perror("mmap framebuffer");
+		perror(PFX "mmap framebuffer");
 		return NULL;
 	}
 
@@ -171,6 +181,17 @@ int vout_fbdev_get_fd(struct vout_fbdev *fbdev)
 	return fbdev->fd;
 }
 
+void *vout_fbdev_get_active_mem(struct vout_fbdev *fbdev)
+{
+	int i;
+
+	i = fbdev->buffer_write - 1;
+	if (i < 0)
+		i = fbdev->buffer_count - 1;
+
+	return (char *)fbdev->mem + fbdev->fb_size * i;
+}
+
 struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int bpp, int buffer_cnt)
 {
 	struct vout_fbdev *fbdev;
@@ -184,14 +205,14 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
 
 	fbdev->fd = open(fbdev_name, O_RDWR);
 	if (fbdev->fd == -1) {
-		fprintf(stderr, "%s: ", fbdev_name);
+		fprintf(stderr, PFX "%s: ", fbdev_name);
 		perror("open");
 		goto fail_open;
 	}
 
 	ret = ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->fbvar_old);
 	if (ret == -1) {
-		perror("FBIOGET_VSCREENINFO ioctl");
+		perror(PFX "FBIOGET_VSCREENINFO ioctl");
 		goto fail;
 	}
 
@@ -208,18 +229,28 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
 	if (pret == NULL)
 		goto fail;
 
-	printf("%s: %ix%i@%d\n", fbdev_name, fbdev->fbvar_new.xres, fbdev->fbvar_new.yres,
-		fbdev->fbvar_new.bits_per_pixel);
+	printf(PFX "%s: %ix%i@%d\n", fbdev_name, fbdev->fbvar_new.xres,
+		fbdev->fbvar_new.yres, fbdev->fbvar_new.bits_per_pixel);
 	*w = fbdev->fbvar_new.xres;
 	*h = fbdev->fbvar_new.yres;
 
 	memset(fbdev->mem, 0, fbdev->mem_size);
 
 	// some checks
+	// screen was unblanked by vout_fbdev_resize(), so vsync should work
+	// first try pandora's adaptive vsync hack, then the default one
 	ret = 0;
-	ret = ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &ret);
+	ret = ioctl(fbdev->fd, OMAPFB_WAITFORVSYNC_FRAME, &ret);
+	if (ret == 0)
+		fbdev->vsync_ioctl = OMAPFB_WAITFORVSYNC_FRAME;
+	if (ret != 0) {
+		ret = 0;
+		ret = ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &ret);
+		if (ret == 0)
+			fbdev->vsync_ioctl = FBIO_WAITFORVSYNC;
+	}
 	if (ret != 0)
-		fprintf(stderr, "Warning: vsync doesn't seem to be supported\n");
+		fprintf(stderr, PFX "Warning: vsync doesn't seem to be supported\n");
 
 	if (fbdev->buffer_count > 1) {
 		fbdev->buffer_write = 0;
@@ -227,7 +258,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
 		ret = ioctl(fbdev->fd, FBIOPAN_DISPLAY, &fbdev->fbvar_new);
 		if (ret != 0) {
 			fbdev->buffer_count = 1;
-			fprintf(stderr, "Warning: can't pan display, doublebuffering disabled\n");
+			fprintf(stderr, PFX "Warning: can't pan display, doublebuffering disabled\n");
 		}
 	}
 
@@ -241,14 +272,66 @@ fail_open:
 	return NULL;
 }
 
-void vout_fbdev_finish(struct vout_fbdev *fbdev)
+static void vout_fbdev_release(struct vout_fbdev *fbdev)
 {
 	ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_old);
 	if (fbdev->mem != MAP_FAILED)
 		munmap(fbdev->mem, fbdev->mem_size);
+	fbdev->mem = NULL;
+}
+
+int vout_fbdev_save(struct vout_fbdev *fbdev)
+{
+	void *tmp;
+
+	if (fbdev == NULL || fbdev->mem == NULL || fbdev->mem == MAP_FAILED) {
+		fprintf(stderr, PFX "bad args for save\n");
+		return -1;
+	}
+
+	if (fbdev->mem_saved_size < fbdev->mem_size) {
+		tmp = realloc(fbdev->mem_saved, fbdev->mem_size);
+		if (tmp == NULL)
+			return -1;
+		fbdev->mem_saved = tmp;
+	}
+	memcpy(fbdev->mem_saved, fbdev->mem, fbdev->mem_size);
+	fbdev->mem_saved_size = fbdev->mem_size;
+
+	vout_fbdev_release(fbdev);
+	return 0;
+}
+
+int vout_fbdev_restore(struct vout_fbdev *fbdev)
+{
+	int ret;
+
+	if (fbdev == NULL || fbdev->mem != NULL) {
+		fprintf(stderr, PFX "bad args/state for restore\n");
+		return -1;
+	}
+
+	fbdev->mem = mmap(0, fbdev->mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
+	if (fbdev->mem == MAP_FAILED) {
+		perror(PFX "restore: memory restore failed");
+		return -1;
+	}
+	memcpy(fbdev->mem, fbdev->mem_saved, fbdev->mem_size);
+
+	ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
+	if (ret == -1) {
+		perror(PFX "restore: FBIOPUT_VSCREENINFO");
+		return -1;
+	}
+
+	return 0;
+}
+
+void vout_fbdev_finish(struct vout_fbdev *fbdev)
+{
+	vout_fbdev_release(fbdev);
 	if (fbdev->fd >= 0)
 		close(fbdev->fd);
-	fbdev->mem = NULL;
 	fbdev->fd = -1;
 	free(fbdev);
 }