X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flinux%2Ffbdev.c;h=ec3d5c7ec33c3b53fedd9a0520f96925bacaac39;hp=6ae0c7714240025066c33be8c1e6cc97875fd2f6;hb=0e2e3f498456d1175916ecd69d0a9e80e701e760;hpb=b60f2812208aa36dc8b9e8e90f02b608dafd0c00

diff --git a/frontend/linux/fbdev.c b/frontend/linux/fbdev.c
index 6ae0c771..ec3d5c7e 100644
--- a/frontend/linux/fbdev.c
+++ b/frontend/linux/fbdev.c
@@ -1,7 +1,10 @@
 /*
  * (C) Gražvydas "notaz" Ignotas, 2009-2010
  *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
  * See the COPYING file in the top-level directory.
  */
 
@@ -19,7 +22,7 @@
 
 #include "fbdev.h"
 
-#define FBDEV_MAX_BUFFERS 3
+#define PFX "fbdev: "
 
 struct vout_fbdev {
 	int	fd;
@@ -31,6 +34,8 @@ struct vout_fbdev {
 	int	fb_size;
 	int	buffer_count;
 	int	top_border, bottom_border;
+	void	*mem_saved;
+	size_t	mem_saved_size;
 };
 
 void *vout_fbdev_flip(struct vout_fbdev *fbdev)
@@ -60,8 +65,9 @@ void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
 	ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &arg);
 }
 
-int vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h,
-		      int left_border, int right_border, int top_border, int bottom_border, int no_dblbuf)
+/* it is recommended to call vout_fbdev_clear() before this */
+void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
+		      int left_border, int right_border, int top_border, int bottom_border, int buffer_cnt)
 {
 	int w_total = left_border + w + right_border;
 	int h_total = top_border + h + bottom_border;
@@ -71,67 +77,79 @@ int vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h,
 	// unblank to be sure the mode is really accepted
 	ioctl(fbdev->fd, FBIOBLANK, FB_BLANK_UNBLANK);
 
-	if (fbdev->fbvar_new.bits_per_pixel != 16 ||
-			w != fbdev->fbvar_new.xres ||
-			h != fbdev->fbvar_new.yres ||
-			w_total != fbdev->fbvar_new.xres_virtual ||
-			h_total > fbdev->fbvar_new.yres_virtual ||
-			left_border != fbdev->fbvar_new.xoffset) {
+	if (fbdev->fbvar_new.bits_per_pixel != bpp ||
+			fbdev->fbvar_new.xres != w ||
+			fbdev->fbvar_new.yres != h ||
+			fbdev->fbvar_new.xres_virtual != w_total||
+			fbdev->fbvar_new.yres_virtual < h_total ||
+			fbdev->fbvar_new.xoffset != left_border ||
+			fbdev->buffer_count != buffer_cnt)
+	{
+		if (fbdev->fbvar_new.bits_per_pixel != bpp ||
+				w != fbdev->fbvar_new.xres || h != fbdev->fbvar_new.yres)
+			printf(PFX "switching to %dx%d@%d\n", w, h, bpp);
+
 		fbdev->fbvar_new.xres = w;
 		fbdev->fbvar_new.yres = h;
 		fbdev->fbvar_new.xres_virtual = w_total;
-		fbdev->fbvar_new.yres_virtual = h_total;
+		fbdev->fbvar_new.yres_virtual = h_total * buffer_cnt;
 		fbdev->fbvar_new.xoffset = left_border;
-		fbdev->fbvar_new.bits_per_pixel = 16;
-		printf(" switching to %dx%d@16\n", w, h);
-		ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
-		if (ret == -1) {
-			perror("FBIOPUT_VSCREENINFO ioctl");
-			return -1;
-		}
-	}
+		fbdev->fbvar_new.yoffset = top_border;
+		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 = buffer_cnt > 1 ? 1 : 0;
 
-	fbdev->buffer_count = FBDEV_MAX_BUFFERS; // be optimistic
-	if (no_dblbuf)
-		fbdev->buffer_count = 1;
+		// seems to help a bit to avoid glitches
+		vout_fbdev_wait_vsync(fbdev);
 
-	if (fbdev->fbvar_new.yres_virtual < h_total * fbdev->buffer_count) {
-		fbdev->fbvar_new.yres_virtual = h_total * fbdev->buffer_count;
 		ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
 		if (ret == -1) {
+			// retry with no multibuffering
+			fbdev->fbvar_new.yres_virtual = h_total;
+			ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
+			if (ret == -1) {
+				perror(PFX "FBIOPUT_VSCREENINFO ioctl");
+				return NULL;
+			}
 			fbdev->buffer_count = 1;
-			fprintf(stderr, "Warning: failed to increase virtual resolution, "
-					"doublebuffering disabled\n");
+			fbdev->buffer_write = 0;
+			fprintf(stderr, PFX "Warning: failed to increase virtual resolution, "
+					"multibuffering disabled\n");
 		}
+
 	}
 
-	fbdev->fb_size = w_total * h_total * 2;
+	fbdev->fb_size = w_total * h_total * bpp / 8;
 	fbdev->top_border = top_border;
 	fbdev->bottom_border = bottom_border;
 
 	mem_size = fbdev->fb_size * fbdev->buffer_count;
 	if (fbdev->mem_size >= mem_size)
-		return 0;
+		goto out;
 
 	if (fbdev->mem != NULL)
 		munmap(fbdev->mem, fbdev->mem_size);
 
 	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", fbdev->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;
 		fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
 	}
 	if (fbdev->mem == MAP_FAILED) {
 		fbdev->mem = NULL;
 		fbdev->mem_size = 0;
-		perror("mmap framebuffer");
-		return -1;
+		perror(PFX "mmap framebuffer");
+		return NULL;
 	}
 
 	fbdev->mem_size = mem_size;
-	return 0;
+
+out:
+	return (char *)fbdev->mem + fbdev->fb_size * fbdev->buffer_write;
 }
 
 void vout_fbdev_clear(struct vout_fbdev *fbdev)
@@ -157,10 +175,11 @@ int vout_fbdev_get_fd(struct vout_fbdev *fbdev)
 	return fbdev->fd;
 }
 
-struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int no_dblbuf)
+struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int bpp, int buffer_cnt)
 {
 	struct vout_fbdev *fbdev;
 	int req_w, req_h;
+	void *pret;
 	int ret;
 
 	fbdev = calloc(1, sizeof(*fbdev));
@@ -169,14 +188,14 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 
 	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;
 	}
 
@@ -189,12 +208,12 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 	if (*h != 0)
 		req_h = *h;
 
-	ret = vout_fbdev_resize(fbdev, req_w, req_h, 0, 0, 0, 0, no_dblbuf);
-	if (ret != 0)
+	pret = vout_fbdev_resize(fbdev, req_w, req_h, bpp, 0, 0, 0, 0, buffer_cnt);
+	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;
 
@@ -204,7 +223,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 	ret = 0;
 	ret = ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &ret);
 	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;
@@ -212,7 +231,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 		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");
 		}
 	}
 
@@ -226,14 +245,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);
 }