X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Ffbdev.c;h=9d532a532d02dd15392d90f873020aea894100de;hb=f342bededbe5d51afd1632e689f5105e50d4f63e;hp=afcd52909cc438b13430dcaf5a62a15409be8baf;hpb=1f8b4b8474ca5d7edbecf15f6122268e83bcd251;p=libpicofe.git

diff --git a/linux/fbdev.c b/linux/fbdev.c
index afcd529..9d532a5 100644
--- a/linux/fbdev.c
+++ b/linux/fbdev.c
@@ -1,3 +1,13 @@
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2009-2010
+ *
+ * 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.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,8 +22,6 @@
 
 #include "fbdev.h"
 
-#define FBDEV_MAX_BUFFERS 3
-
 struct vout_fbdev {
 	int	fd;
 	void	*mem;
@@ -21,8 +29,9 @@ struct vout_fbdev {
 	struct	fb_var_screeninfo fbvar_old;
 	struct	fb_var_screeninfo fbvar_new;
 	int	buffer_write;
-	void	*buffers[FBDEV_MAX_BUFFERS];
+	int	fb_size;
 	int	buffer_count;
+	int	top_border, bottom_border;
 };
 
 void *vout_fbdev_flip(struct vout_fbdev *fbdev)
@@ -37,11 +46,13 @@ void *vout_fbdev_flip(struct vout_fbdev *fbdev)
 	if (fbdev->buffer_write >= fbdev->buffer_count)
 		fbdev->buffer_write = 0;
 
-	fbdev->fbvar_new.yoffset = fbdev->fbvar_old.yres * draw_buf;
+	fbdev->fbvar_new.yoffset = 
+		(fbdev->top_border + fbdev->fbvar_new.yres + fbdev->bottom_border) * draw_buf +
+		fbdev->top_border;
 
 	ioctl(fbdev->fd, FBIOPAN_DISPLAY, &fbdev->fbvar_new);
 
-	return fbdev->buffers[fbdev->buffer_write];
+	return (char *)fbdev->mem + fbdev->fb_size * fbdev->buffer_write;
 }
 
 void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
@@ -50,15 +61,122 @@ void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
 	ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &arg);
 }
 
+/* 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;
+	size_t mem_size;
+	int ret;
+
+	// unblank to be sure the mode is really accepted
+	ioctl(fbdev->fd, FBIOBLANK, FB_BLANK_UNBLANK);
+
+	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(" 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 * buffer_cnt;
+		fbdev->fbvar_new.xoffset = left_border;
+		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 = 1;
+
+		// seems to help a bit to avoid glitches
+		vout_fbdev_wait_vsync(fbdev);
+
+		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, "
+					"multibuffering disabled\n");
+		}
+
+	}
+
+	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)
+		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", 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 NULL;
+	}
+
+	fbdev->mem_size = mem_size;
+
+out:
+	return (char *)fbdev->mem + fbdev->fb_size * fbdev->buffer_write;
+}
+
 void vout_fbdev_clear(struct vout_fbdev *fbdev)
 {
 	memset(fbdev->mem, 0, fbdev->mem_size);
 }
 
-struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int no_dblbuf)
+void vout_fbdev_clear_lines(struct vout_fbdev *fbdev, int y, int count)
+{
+	int stride = fbdev->fbvar_new.xres_virtual * fbdev->fbvar_new.bits_per_pixel / 8;
+	int i;
+
+	if (y + count > fbdev->top_border + fbdev->fbvar_new.yres)
+		count = fbdev->top_border + fbdev->fbvar_new.yres - y;
+
+	if (y >= 0 && count > 0)
+		for (i = 0; i < fbdev->buffer_count; i++)
+			memset((char *)fbdev->mem + fbdev->fb_size * i + y * stride, 0, stride * count);
+}
+
+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 bpp, int buffer_cnt)
 {
 	struct vout_fbdev *fbdev;
-	int i, ret;
+	int req_w, req_h;
+	void *pret;
+	int ret;
 
 	fbdev = calloc(1, sizeof(*fbdev));
 	if (fbdev == NULL)
@@ -78,49 +196,24 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 	}
 
 	fbdev->fbvar_new = fbdev->fbvar_old;
-	printf("%s: %ix%i@%d\n", fbdev_name, fbdev->fbvar_old.xres, fbdev->fbvar_old.yres,
-		fbdev->fbvar_old.bits_per_pixel);
-	*w = fbdev->fbvar_old.xres;
-	*h = fbdev->fbvar_old.yres;
-	fbdev->buffer_count = FBDEV_MAX_BUFFERS; // be optimistic
-	if (no_dblbuf)
-		fbdev->buffer_count = 1;
 
-	if (fbdev->fbvar_new.bits_per_pixel != 16) {
-		printf(" switching to 16bpp\n");
-		fbdev->fbvar_new.bits_per_pixel = 16;
-		ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
-		if (ret == -1) {
-			perror("FBIOPUT_VSCREENINFO ioctl");
-			goto fail;
-		}
-	}
-
-	if (fbdev->fbvar_new.yres_virtual < fbdev->fbvar_old.yres * fbdev->buffer_count) {
-		fbdev->fbvar_new.yres_virtual = fbdev->fbvar_old.yres * fbdev->buffer_count;
-		ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
-		if (ret == -1) {
-			fbdev->buffer_count = 1;
-			fprintf(stderr, "Warning: failed to increase virtual resolution, "
-					"doublebuffering disabled\n");
-		}
-	}
+	req_w = fbdev->fbvar_new.xres;
+	if (*w != 0)
+		req_w = *w;
+	req_h = fbdev->fbvar_new.yres;
+	if (*h != 0)
+		req_h = *h;
 
-	fbdev->mem_size = *w * *h * 2 * fbdev->buffer_count;
-	fbdev->mem = mmap(0, fbdev->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);
-		fbdev->mem_size = *w * *h * 2;
-		fbdev->buffer_count = 1;
-		fbdev->mem = mmap(0, fbdev->mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
-	}
-	if (fbdev->mem == MAP_FAILED) {
-		perror("mmap framebuffer");
+	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);
+	*w = fbdev->fbvar_new.xres;
+	*h = fbdev->fbvar_new.yres;
+
 	memset(fbdev->mem, 0, fbdev->mem_size);
-	for (i = 0; i < fbdev->buffer_count; i++)
-		fbdev->buffers[i] = (char *)fbdev->mem + i * *w * *h * 2;
 
 	// some checks
 	ret = 0;
@@ -130,7 +223,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int n
 
 	if (fbdev->buffer_count > 1) {
 		fbdev->buffer_write = 0;
-		fbdev->fbvar_new.yoffset = fbdev->fbvar_old.yres * (fbdev->buffer_count - 1);
+		fbdev->fbvar_new.yoffset = fbdev->fbvar_new.yres * (fbdev->buffer_count - 1);
 		ret = ioctl(fbdev->fd, FBIOPAN_DISPLAY, &fbdev->fbvar_new);
 		if (ret != 0) {
 			fbdev->buffer_count = 1;
@@ -160,21 +253,3 @@ void vout_fbdev_finish(struct vout_fbdev *fbdev)
 	free(fbdev);
 }
 
-#if 0
-void *g_screen_ptr;
-int main()
-{
-	int w, h;
-	vout_fbdev_init(&w, &h);
-	//while (1)
-	{
-		memset(g_screen_ptr, 0xff, fbdev_mem_size / 2);
-		plat_video_wait_vsync();
-		plat_video_flip();
-		memset(g_screen_ptr, 0x00, fbdev_mem_size / 2);
-		usleep(8000);
-//		plat_video_wait_vsync();
-		plat_video_flip();
-	}
-}
-#endif