Changeset 26471

Timestamp:

02/25/14 22:46:21 (9 years ago)

Author:

obi

Message:

mipsel optimize framebuffer and enable double buffering

Location:

titan/titan

Files:

• fb.h (modified) (9 diffs)
• mipselport.h (modified) (6 diffs)

titan/titan/fb.h

@@ -225 +225 @@
         }
 
-        printf("[Framebuffer] %dk video mem\n", fix_screeninfo.smem_len/1024);
         if(!(mmapfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)))
         {
@@ -232 +231 @@
                 return NULL;
         }
+
+        debug(100, "%dk video mem", fix_screeninfo.smem_len/1024);
+
+        lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0);
+        if (!lfb)
+        {
+                perror("mmap");
+                goto nolfb;
+        }
+
+        if (checkbox("ATEMIO5000") == 1 && var_screeninfo.bits_per_pixel != 32)
+        {
+                debug(100, "Only 32 bit per pixel supported. Framebuffer currently use %d", var_screeninfo.bits_per_pixel);
+                closefb();
+                return 0;
+        }
+
 
         if(devnr == 0)
@@ -257 +273 @@
         }
 
-        printf("framebuffer not available.\n");
+        debug(100, "framebuffer not available.");
+
         return 0;
 // blinking work end
@@ -264 +281 @@
 void closefb()
 {
-
         if(checkbox("ATEMIO5000") == 1)
         {
                 if(lfb)
                 {
-                printf("33\n");
+                        debug(100, "ms_sync");
                         msync(lfb, fix_screeninfo.smem_len, MS_SYNC);
                         munmap(lfb, fix_screeninfo.smem_len);
@@ -275 +291 @@
                 if(fb->fd >= 0)
                 {
-                printf("44\n");
+                        debug(100, "close");
                         disablemanualblit();
                         close(fb->fd);
@@ -320 +336 @@
 void changefbresolution(char *value, int flag)
 {
+        debug(100, "fb->colbytes: %d", fb->colbytes);
+        if(checkbox("ATEMIO5000") == 1) return;
+
         if(ostrcmp("pal", value) == 0)
         {
                 fb->width = 720;
                 fb->height = 576;
-                if(checkbox("ATEMIO5000") == 1)
-                        fb->pitch = fb->width * (fb->colbytes * 8);
-                else
-                        fb->pitch = fb->width * fb->colbytes;
+                fb->pitch = fb->width * fb->colbytes;
         }
         else if(ostrncmp("576", value, 3) == 0)
@@ -333 +349 @@
                 fb->width = 720;
                 fb->height = 576;
-                if(checkbox("ATEMIO5000") == 1)
-                        fb->pitch = fb->width * (fb->colbytes * 8);
-                else
-                        fb->pitch = fb->width * fb->colbytes;
-
+                fb->pitch = fb->width * fb->colbytes;
         }
         else if(ostrncmp("720", value, 3) == 0)
@@ -343 +355 @@
                 fb->width = 1280;
                 fb->height = 720;
-                if(checkbox("ATEMIO5000") == 1)
-                        fb->pitch = fb->width * (fb->colbytes * 8);
-                else
-                        fb->pitch = fb->width * fb->colbytes;
-
+                fb->pitch = fb->width * fb->colbytes;
         }
         else if(ostrncmp("1080", value, 4) == 0)
@@ -353 +361 @@
                 fb->width = 1920;
                 fb->height = 1080;
-                if(checkbox("ATEMIO5000") == 1)
-                        fb->pitch = fb->width * (fb->colbytes * 8);
-                else
-                        fb->pitch = fb->width * fb->colbytes;
-
+                fb->pitch = fb->width * fb->colbytes;
         }
         if(skinfb == fb)

titan/titan/mipselport.h

@@ -15 +15 @@
 int g_manual_blit = 0;
 struct fb_fix_screeninfo fix_screeninfo;
+struct fb_var_screeninfo var_screeninfo;
 
 int setmixer(struct dvbdev* node, int left, int right)
@@ -63 +64 @@
         if(newnode != NULL)
                 newnode->varfbsize = 1920 * 1080 * newnode->colbytes;
+//              newnode->varfbsize = 1920 * 1080 * (newnode->colbytes * 8);
+
 }
 
@@ -81 +84 @@
         else
                 g_manual_blit = 0;
+}
+
+void blit()
+{
+        if (g_manual_blit == 1) {
+                if (ioctl(fb->fd, FBIO_BLIT) < 0)
+                        perror("FBIO_BLIT");
+        }
 }
 
@@ -117 +128 @@
         var_screeninfo.yoffset = 0;
         var_screeninfo.bits_per_pixel = fb->colbytes * 8;
-
+        
         switch(fb->colbytes)
         {
@@ -142 +153 @@
         }
         
+        debug(100, "FB: line_length %d", fix_screeninfo.line_length);
+        debug(100, "FB: var_screeninfo.xres %d", var_screeninfo.xres);
+        debug(100, "FB: var_screeninfo.yres %d", var_screeninfo.yres);
+        debug(100, "FB: var_screeninfo.xres_virt %d", var_screeninfo.xres_virtual);
+        debug(100, "FB: var_screeninfo.yres_virt %d", var_screeninfo.yres_virtual);
+        debug(100, "FB: var_screeninfo.xoffset %d", var_screeninfo.xoffset);
+        debug(100, "FB: var_screeninfo.yoffset %d", var_screeninfo.yoffset);
+        debug(100, "FB: var_screeninfo.bits_per_pixel %d", var_screeninfo.bits_per_pixel);
+        debug(100, "FB: var_screeninfo.grayscale %d", var_screeninfo.grayscale);
 
         if(ioctl(fb->fd, FBIOPUT_VSCREENINFO, &var_screeninfo) < 0)
@@ -150 +170 @@
                         perr("FBIOPUT_VSCREENINFO");
                 }
-        }
-
-        if (g_manual_blit == 1) {
-                if (ioctl(fb->fd, FBIO_BLIT) < 0)
-                        perr("FBIO_BLIT");
-        }
-
+                debug(100, "FB: double buffering not available");
+        }
+        else
+        {
+                debug(100, "FB: double buffering available!");
+        }
+
+        ioctl(fb->fd, FBIOGET_VSCREENINFO, &var_screeninfo);
+//      if ((var_screeninfo.xres!=fb->width) && (var_screeninfo.yres!=fb->height) && (var_screeninfo.bits_per_pixel!=fb->colbytes))
+//      {
+                debug(100, "SetMode failed: wanted: %dx%dx%d, got %dx%dx%d",
+                        fb->width, fb->height, fb->colbytes,
+                        var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel);
+//      }
+/*      
+        int xRes, yRes, stride, bpp;
+        
+        xRes=var_screeninfo.xres;
+        yRes=var_screeninfo.yres;
+        bpp=var_screeninfo.bits_per_pixel;
+//      fb_fix_screeninfo fix;
+//      struct fb_fix_screeninfo fix_screeninfo;
+        if (ioctl(fb->fd, FBIOGET_FSCREENINFO, &fix_screeninfo)<0)
+        {
+                perror("FBIOGET_FSCREENINFO");
+                printf("fb failed\n");
+        }
+        stride=fix_screeninfo.line_length;
+        memset(lfb, 0, stride*yRes);
+*/
+        blit();
+        
 /*
         int i = 0, max = 1, wstep = 0, hstep = 0, ret = 0;