frontend: fbdev buffer fix

[pcsx_rearmed.git] / frontend / linux / fbdev.c

diff --git a/frontend/linux/fbdev.c b/frontend/linux/fbdev.c
index fffe979..afd5531 100644 (file)
--- 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.
  */
 
@@ -58,7 +61,8 @@ 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 bpp,
+/* 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;
@@ -70,35 +74,46 @@ int vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
        ioctl(fbdev->fd, FBIOBLANK, FB_BLANK_UNBLANK);
 
        if (fbdev->fbvar_new.bits_per_pixel != bpp ||
-                       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) {
+                       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(" 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.yoffset = top_border;
                fbdev->fbvar_new.bits_per_pixel = bpp;
-               printf(" switching to %dx%d@%d\n", w, h, bpp);
-               ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
-               if (ret == -1) {
-                       perror("FBIOPUT_VSCREENINFO ioctl");
-                       return -1;
-               }
-       }
+               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 = buffer_cnt;
+               // 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("FBIOPUT_VSCREENINFO ioctl");
+                               return NULL;
+                       }
                        fbdev->buffer_count = 1;
+                       fbdev->buffer_write = 0;
                        fprintf(stderr, "Warning: failed to increase virtual resolution, "
-                                       "doublebuffering disabled\n");
+                                       "multibuffering disabled\n");
                }
+
        }
 
        fbdev->fb_size = w_total * h_total * bpp / 8;
@@ -107,15 +122,16 @@ int vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
 
        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, "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);
        }
@@ -123,11 +139,13 @@ int vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
                fbdev->mem = NULL;
                fbdev->mem_size = 0;
                perror("mmap framebuffer");
-               return -1;
+               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,6 +175,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
 {
        struct vout_fbdev *fbdev;
        int req_w, req_h;
+       void *pret;
        int ret;
 
        fbdev = calloc(1, sizeof(*fbdev));
@@ -185,8 +204,8 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
        if (*h != 0)
                req_h = *h;
 
-       ret = vout_fbdev_resize(fbdev, req_w, req_h, bpp, 0, 0, 0, 0, buffer_cnt);
-       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,