Lcd save function pointer to frame buffer get_address_fn before loops

Calling multiple levels of indirection in a loop slows things down

Really these need to be rewritten to take a start and end address
like most of the rest of the codebase

But this is safer without having test hardware in hand

Change-Id: Idae7b92ee779d020ed7fcc9334e2d5a9c710e64d

firmware/drivers/lcd-color-common.c

@@ -214,6 +214,7 @@ void lcd_drawline(int x1, int y1, int x2, int y2)
     int d, dinc1, dinc2;
     int x, xinc1, xinc2;
     int y, yinc1, yinc2;
+    int x_vp, y_vp, w_vp, h_vp;
     lcd_fastpixelfunc_type *pfunc = lcd_fastpixelfuncs[lcd_current_viewport->drawmode];
 
     deltay = abs(y2 - y1);
@@ -268,16 +269,23 @@ void lcd_drawline(int x1, int y1, int x2, int y2)
     x = x1;
     y = y1;
 
+    void *(*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
+    x_vp = lcd_current_viewport->x;
+    y_vp = lcd_current_viewport->y;
+    w_vp = lcd_current_viewport->width;
+    h_vp = lcd_current_viewport->height;
+
     for (i = 0; i < numpixels; i++)
     {
-        if (   ((unsigned)x < (unsigned)lcd_current_viewport->width)
+        if ((x >= 0 && y >= 0)
-            && ((unsigned)y < (unsigned)lcd_current_viewport->height)
+            && (x < w_vp)
+            && (y < h_vp)
 #if defined(HAVE_VIEWPORT_CLIP)
-            && ((unsigned)x < (unsigned)LCD_WIDTH)
+            && (x < LCD_WIDTH)
-            && ((unsigned)y < (unsigned)LCD_HEIGHT)
+            && (y < LCD_HEIGHT)
 #endif
             )
-            pfunc(FBADDR(x + lcd_current_viewport->x, y + lcd_current_viewport->y));
+            pfunc(fbaddr( x + x_vp, y + y_vp));
 
         if (d < 0)
         {

firmware/export/lcd.h

@@ -507,7 +507,9 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits);
 
 extern struct viewport* lcd_current_viewport;
 
-#define FBADDR(x,y) ((fb_data*) lcd_current_viewport->buffer->get_address_fn(x, y))
+#define FB_CURRENTVP_BUFFER (lcd_current_viewport->buffer)
+#define FBADDRBUF(buffer,x,y) ((fb_data*) buffer->get_address_fn(x,y))
+#define FBADDR(x,y) (FBADDRBUF(lcd_current_viewport->buffer,x,y))
 
 #define FRAMEBUFFER_SIZE (sizeof(fb_data)*LCD_FBWIDTH*LCD_FBHEIGHT)
 

firmware/target/arm/as3525/lcd-ssd1303.c

@@ -310,6 +310,7 @@ static void internal_update_rect(int x, int y, int width, int height)
     const int column_high = get_column_high_byte(x);
     const int column_low = get_column_low_byte(x);
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= height; y++)
     {
@@ -320,7 +321,7 @@ static void internal_update_rect(int x, int y, int width, int height)
             (column_low)
         );
 
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
     lcd_write_command (LCD_NOP); /* return to command mode */
 

firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c

@@ -440,9 +440,10 @@ void lcd_update_rect(int x, int y, int width, int height)
     /* setup GRAM write window */
     lcd_setup_rect(x, x_end - 1, y, y_end - 1);
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* write to GRAM */
     for (row = y; row < y_end; row++) {
-        lcd_write_data(FBADDR(x,row), width);
+        lcd_write_data(fbaddr(x,row), width);
     }
 }
 

firmware/target/arm/imx233/creative-zen/lcd-zenmozaic.c

@@ -149,6 +149,8 @@ void lcd_update_rect(int x, int y, int w, int h)
     lcd_write_reg(0x17, y | (y + h - 1) << 8);
     lcd_write_reg(0x21, y * LCD_WIDTH + x);
     lcd_write_reg(0x22, 0);
+
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     for(int yy = y; yy < y + h; yy++)
-        imx233_lcdif_pio_send(true, 2 * w, FBADDR(x, yy));
+        imx233_lcdif_pio_send(true, 2 * w, fbaddr(x,yy));
 }

firmware/target/arm/imx233/creative-zen/lcd-zenv.c

@@ -172,8 +172,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     lcd_send(false, 0x75); lcd_send(true, y); lcd_send(true, y + h - 1);
     lcd_send(false, 0x5c);
     imx233_lcdif_set_word_length(16);
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     for(int yy = y; yy < y + h; yy++)
-        imx233_lcdif_pio_send(true, w, FBADDR(x, yy));
+        imx233_lcdif_pio_send(true, w, fbaddr(x,yy));
 }
 
 #ifndef BOOTLOADER

firmware/target/arm/imx233/creative-zen/lcd-zenxfistyle.c

@@ -282,8 +282,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c

@@ -241,8 +241,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c

@@ -188,8 +188,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/imx233/sansa-fuzeplus/lcd-fuzeplus.c

@@ -637,8 +637,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/imx233/sony-nwz/lcd-nwze360.c

@@ -228,8 +228,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/imx233/sony-nwz/lcd-nwze370.c

@@ -189,8 +189,9 @@ void lcd_update_rect(int x, int y, int w, int h)
     }
     else
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(int i = 0; i < h; i++)
-            memcpy((fb_data *)FRAME + i * w, FBADDR(x,y + i), w * sizeof(fb_data));
+            memcpy((fb_data *)FRAME + i * w, fbaddr(x,y + i), w * sizeof(fb_data));
     }
     /* WARNING The LCDIF has a limitation on the vertical count ! In 16-bit packed mode
      * (which we used, ie 16-bit per pixel, 2 pixels per 32-bit words), the v_count

firmware/target/arm/ipod/lcd-gray.c

@@ -333,17 +333,18 @@ void lcd_update_rect(int x, int y, int width, int height)
     x >>= 3;
     width = xmax - x + 1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     for (; y <= ymax; y++)
     {
         lcd_cmd_and_data(R_RAM_ADDR_SET, (y << 5) + addr_offset - x);
         lcd_prepare_cmd(R_RAM_DATA);
-
+        fb_data *data = fbaddr(2*x,y);
 #if defined(IPOD_MINI) || defined(IPOD_MINI2G)
         if (pix_offset == -2)
-            lcd_write_data_shifted(FBADDR(2*x, y), width);
+            lcd_write_data_shifted(data, width);
         else
 #endif
-            lcd_write_data(FBADDR(2*x, y), width);
+            lcd_write_data(data, width);
     }
 }
 

firmware/target/arm/lcd-ssd1815.c

@@ -221,6 +221,7 @@ void lcd_update(void)
 {
     int y;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy display bitmap to hardware */
     for (y = 0; y < LCD_FBHEIGHT; y++)
     {
@@ -228,7 +229,7 @@ void lcd_update(void)
         lcd_write_command (LCD_CNTL_HIGHCOL | ((xoffset >> 4) & 0xf));
         lcd_write_command (LCD_CNTL_LOWCOL | (xoffset & 0xf));
 
-        lcd_write_data (FBADDR(0, y), LCD_WIDTH);
+        lcd_write_data (fbaddr(0,y), LCD_WIDTH);
     }
 }
 
@@ -249,6 +250,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     if(ymax >= LCD_FBHEIGHT)
         ymax = LCD_FBHEIGHT-1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -256,6 +258,6 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_command (LCD_CNTL_HIGHCOL | (((x+xoffset) >> 4) & 0xf));
         lcd_write_command (LCD_CNTL_LOWCOL | ((x+xoffset) & 0xf));
 
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }

firmware/target/arm/olympus/mrobe-100/lcd-mr100.c

@@ -232,6 +232,7 @@ void lcd_update(void)
     cmd1 = LCD_CNTL_HIGHCOL | (((xoffset) >> 4) & 0xf);
     cmd2 = LCD_CNTL_LOWCOL | ((xoffset) & 0xf);
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy display bitmap to hardware */
     for (y = 0; y < LCD_FBHEIGHT; y++)
     {
@@ -239,7 +240,7 @@ void lcd_update(void)
         lcd_write_command(cmd1);
         lcd_write_command(cmd2);
 
-        lcd_write_data (FBADDR(0, y), LCD_WIDTH);
+        lcd_write_data (fbaddr(0,y), LCD_WIDTH);
     }
 }
 
@@ -264,6 +265,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     cmd1 = LCD_CNTL_HIGHCOL | (((x + xoffset) >> 4) & 0xf);
     cmd2 = LCD_CNTL_LOWCOL | ((x + xoffset) & 0xf);
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -271,6 +273,6 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_command(cmd1);
         lcd_write_command(cmd2);
 
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }

firmware/target/arm/rk27xx/lcdif-rk27xx.c

@@ -198,9 +198,10 @@ static void create_llp(int x, int y, int width, int height)
 
     width = width>>1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* build LLPs */
     for (i=0; i<height; i++)
-        llp_setup((void *)FBADDR(x,y+i),
+        llp_setup((void *)fbaddr(x,y+i),
                   (void*)(LCD_BUFF+((i%4)*4*width)),
                   &(scr_llp[i]),
                   width);

firmware/target/arm/s5l8700/yps3/lcd-yps3.c

@@ -300,13 +300,14 @@ void lcd_update_rect(int x, int y, int width, int height)
     fb_data* p;
     int h, w;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     if (lcd_type == 1) {
         /* TODO implement and test */
         lcd_set_window1(x, y, width, height);
         lcd_set_position1(x, y);
 
         for (h = 0; h < height; h++) {
-            p = FBADDR(0,y);
+            p = fbaddr(0,y);
             for (w = 0; w < LCD_WIDTH; w++) {
                 while (LCD_STATUS & 0x10);
                 LCD_WDATA = *p++;
@@ -319,7 +320,7 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_set_position2(x, y);
 
         for (h = 0; h < height; h++) {
-            p = FBADDR(x,y);
+            p = fbaddr(x,y);
             for (w = 0; w < width; w++) {
                 while (LCD_STATUS & 0x10);
                 LCD_WDATA = *p++;

firmware/target/arm/samsung/yh920/lcd-yh920.c

@@ -253,13 +253,14 @@ void lcd_update_rect(int x, int y, int width, int height)
     if(ymax >= LCD_FBHEIGHT)
         ymax = LCD_FBHEIGHT-1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
         lcd_write_reg(LCD_CNTL_PAGE, y);
         lcd_write_reg(LCD_CNTL_COLUMN, x);
 
-        addr = FBADDR(x,y);
+        addr = fbaddr(x,y);
 
         lcd_send_cmd(LCD_CNTL_DATA_WRITE);
         lcd_write_data(addr, width);

firmware/target/coldfire/iaudio/m3/lcd-m3.c

@@ -258,6 +258,7 @@ void lcd_update(void)
     int y;
     if (initialized)
     {
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         for(y = 0;y < LCD_FBHEIGHT;y++) 
         {
             /* Copy display bitmap to hardware.
@@ -266,7 +267,7 @@ void lcd_update(void)
                have to update one page at a time. */
             lcd_write_command(LCD_SET_PAGE | (y > 5 ? y + 2 : y));
             lcd_write_command_e(LCD_SET_COLUMN | 0, 0);
-            lcd_write_data(FBADDR(0, y), LCD_WIDTH);
+            lcd_write_data(fbaddr(0,y), LCD_WIDTH);
         }
     }
 }
@@ -289,6 +290,7 @@ void lcd_update_rect(int x, int y, int width, int height)
         if(ymax >= LCD_FBHEIGHT)
             ymax = LCD_FBHEIGHT-1;
 
+        void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
         /* Copy specified rectangle bitmap to hardware
            COM48-COM63 are not connected, so we need to skip those */
         for (; y <= ymax; y++) 
@@ -296,7 +298,7 @@ void lcd_update_rect(int x, int y, int width, int height)
             lcd_write_command(LCD_SET_PAGE | ((y > 5 ? y + 2 : y) & 0xf));
             lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf);
 
-            lcd_write_data(FBADDR(x,y), width);
+            lcd_write_data(fbaddr(x,y), width);
         } 
     }
 }

firmware/target/coldfire/iaudio/m5/lcd-m5.c

@@ -200,6 +200,7 @@ void lcd_update(void)
 {
     int y;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy display bitmap to hardware */
     for (y = 0; y < LCD_FBHEIGHT; y++)
     {
@@ -207,7 +208,7 @@ void lcd_update(void)
         lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1);
 
         lcd_write_command(LCD_CNTL_DATA_WRITE);
-        lcd_write_data (FBADDR(0, y), LCD_WIDTH);
+        lcd_write_data (fbaddr(0,y), LCD_WIDTH);
     }
 }
 
@@ -228,6 +229,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     if(ymax >= LCD_FBHEIGHT)
         ymax = LCD_FBHEIGHT-1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -235,6 +237,6 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1);
 
         lcd_write_command(LCD_CNTL_DATA_WRITE);
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }

firmware/target/coldfire/iriver/h100/lcd-h100.c

@@ -209,6 +209,7 @@ void lcd_update(void)
 {
     int y;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy display bitmap to hardware */
     for (y = 0; y < LCD_FBHEIGHT; y++)
     {
@@ -216,7 +217,7 @@ void lcd_update(void)
         lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1);
 
         lcd_write_command(LCD_CNTL_DATA_WRITE);
-        lcd_write_data (FBADDR(0, y), LCD_WIDTH);
+        lcd_write_data (fbaddr(0,y), LCD_WIDTH);
     }
 }
 
@@ -237,6 +238,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     if(ymax >= LCD_FBHEIGHT)
         ymax = LCD_FBHEIGHT-1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -244,6 +246,6 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1);
 
         lcd_write_command(LCD_CNTL_DATA_WRITE);
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }

firmware/target/coldfire/mpio/hd300/lcd-hd300.c

@@ -231,6 +231,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     if(ymax >= LCD_FBHEIGHT)
         ymax = LCD_FBHEIGHT-1;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -238,6 +239,6 @@ void lcd_update_rect(int x, int y, int width, int height)
         lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1);
 
         lcd_write_command(LCD_CNTL_DATA_WRITE);
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }

firmware/target/mips/ingenic_jz47xx/xduoo_x3/lcd-xduoo_x3.c

@@ -532,6 +532,7 @@ void lcd_update(void)
     const int column_high = get_column_high_byte(0);
     const int column_low = get_column_low_byte(0);
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy display bitmap to hardware */
     for (y = 0; y < LCD_FBHEIGHT; y++)
     {
@@ -542,7 +543,7 @@ void lcd_update(void)
             (column_low)
         );
 
-        lcd_write_data (FBADDR(0, y), LCD_WIDTH);
+        lcd_write_data (fbaddr(0,y), LCD_WIDTH);
     }
 }
 
@@ -586,6 +587,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     ymax = (y + height-1) >> 3;
     y >>= 3;
 
+    void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn;
     /* Copy specified rectange bitmap to hardware */
     for (; y <= ymax; y++)
     {
@@ -596,6 +598,6 @@ void lcd_update_rect(int x, int y, int width, int height)
             (column_low)
         );
 
-        lcd_write_data (FBADDR(x,y), width);
+        lcd_write_data (fbaddr(x,y), width);
     }
 }