H300, X5: Optimised lcd_yuv_blit(), using line-pair zig-zag writing to the LCD controller. ~7% speedup on H300, ~5% speedup on X5.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15111 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 134 insertions, 74 deletions

diff --git a/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S b/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
index 11150203af..879235ebf2 100644
--- a/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
+++ b/firmware/target/coldfire/iaudio/x5/lcd-as-x5.S
@@ -45,6 +45,23 @@
  *   |B|   |19611723 33976259         0| |Cr - 128| >> 26
  *
  * Needs EMAC set to saturated, signed integer mode.
+ *
+ * register usage:
+ *   %a0 - LCD data port
+ *   %a1 - Y pointer
+ *   %a2 - C pointer
+ *   %a3 - C width
+ *   %a4 - Y end address
+ *   %a5 - Y factor
+ *   %a6 - BU factor
+ *   %d0 - scratch
+ *   %d1 -     B, previous Y \ alternating
+ *   %d2 - U / B, previous Y /
+ *   %d3 - V / G
+ *   %d4 - R / output pixel
+ *   %d5 - GU factor
+ *   %d6 - GV factor
+ *   %d7 - RGB signed -> unsigned conversion mask
  */
     .align      2
     .global     lcd_write_yuv420_lines
@@ -55,8 +72,8 @@ lcd_write_yuv420_lines:
     movem.l %d2-%d7/%a2-%a6, (%sp)
 
     lea.l   0xf0008002, %a0         /* LCD data port */
-    movem.l (44+4, %sp), %a1-%a4    /* Y data, Cb data, Cr data, width */
-    lea.l   (%a1, %a4), %a4         /* end address */
+    movem.l (44+4, %sp), %a1-%a3    /* Y data, C data, C width */
+    lea.l   (%a1, %a3*2), %a4       /* Y end address */
 
     move.l  #19611723, %a5          /* y factor */
     move.l  #33976259, %a6          /* bu factor */
@@ -65,11 +82,11 @@ lcd_write_yuv420_lines:
     move.l  #0x01040820, %d7        /* bitmask for signed->unsigned conversion
                                      * of R, G and B within RGGB6666 at once */
 
-    /* chroma for (very) first & second pixel */
+    /* chroma for first 2x2 block */
+    clr.l   %d3                     /* load v component */
+    move.b  (%a2, %a3), %d3
     clr.l   %d2                     /* load u component */
     move.b  (%a2)+, %d2
-    clr.l   %d3                     /* load v component */
-    move.b  (%a3)+, %d3
     moveq.l #-128, %d0
     add.l   %d0, %d2
     add.l   %d0, %d3
@@ -80,9 +97,9 @@ lcd_write_yuv420_lines:
     move.l  #26881894, %d0          /* rv factor */
     mac.l   %d0, %d3, %acc2         /* rv */
 
-    /* luma for (very) first pixel */
+    /* luma for very first pixel (top left) */
     clr.l   %d1
-    move.b  (%a1)+, %d1
+    move.b  (%a1, %a3*2), %d1
     moveq.l #-126, %d0
     add.l   %d1, %d0                /* y' (-0.5 ... +0.5) */
     mac.l   %a5, %d0, %acc0
@@ -92,11 +109,11 @@ lcd_write_yuv420_lines:
     bra.b   .yuv_line_entry
 
 .yuv_line_loop:
-    /* chroma for first & second pixel */
+    /* chroma for 2x2 pixel block */
+    clr.l   %d3                     /* load v component */
+    move.b  (%a2, %a3), %d3
     clr.l   %d2                     /* load u component */
     move.b  (%a2)+, %d2
-    clr.l   %d3                     /* load v component */
-    move.b  (%a3)+, %d3
     moveq.l #-128, %d0
     add.l   %d0, %d2
     add.l   %d0, %d3
@@ -107,9 +124,9 @@ lcd_write_yuv420_lines:
     move.l  #26881894, %d0          /* rv factor */
     mac.l   %d0, %d3, %acc2         /* rv */
 
-    /* luma for first pixel */
+    /* luma for first pixel (top left) */
     clr.l   %d1
-    move.b  (%a1)+, %d1
+    move.b  (%a1, %a3*2), %d1
     moveq.l #-126, %d0
     add.l   %d1, %d0                /* y' (-0.5 ... +0.5) */
     mac.l   %a5, %d0, %acc0
@@ -140,9 +157,10 @@ lcd_write_yuv420_lines:
     move.w  %d4, (%a0)
     swap    %d4
 
-    /* luma for second pixel as delta from the first */
-    clr.l   %d0
-    move.b  (%a1)+, %d0
+    /* luma for second pixel (bottom left) as delta from the first */
+    clr.l   %d2
+    move.b  (%a1)+, %d2
+    move.l  %d2, %d0
     sub.l   %d1, %d0
     mac.l   %a5, %d0, %acc0
     mac.l   %a5, %d0, %acc1
@@ -153,13 +171,45 @@ lcd_write_yuv420_lines:
 
     /* convert to RGB666, pack and output */
     moveq.l #26, %d0
-    movclr.l %acc0, %d4
-    movclr.l %acc1, %d3
-    movclr.l %acc2, %d2
+    move.l  %acc0, %d4
+    move.l  %acc1, %d3
+    move.l  %acc2, %d1
     lsr.l   %d0, %d4
     lsr.l   %d0, %d3
-    lsr.l   %d0, %d2
+    lsr.l   %d0, %d1
+
+    lsl.l   #6, %d1
+    or.l    %d3, %d1                /* |00000000|00000000|0000Rrrr|rrGggggg| */
+    lsl.l   #7, %d1
+    or.l    %d1, %d3                /* |00000000|00000Rrr|rrrGgggg|g0Gggggg| */
+    lsl.l   #6, %d3
+    or.l    %d3, %d4                /* |0000000R|rrrrrGgg|ggg0Gggg|ggBbbbbb| */
+    eor.l   %d7, %d4                /* |0000000r|rrrrrggg|ggg0gggg|ggbbbbbb| */
+    swap    %d4
+    move.w  %d4, (%a0)
+    swap    %d4
+    
+    /* luma for third pixel (top right) as delta from the second */
+    clr.l   %d1
+    move.b  (%a1, %a3*2), %d1
+    move.l  %d1, %d0
+    sub.l   %d2, %d0
+    mac.l   %a5, %d0, %acc0
+    mac.l   %a5, %d0, %acc1
+    mac.l   %a5, %d0, %acc2
+    
+    move.w  %d4, (%a0)
+    /* 2nd LCD write is delayed one pixel to use it for filling the EMAC latency */
 
+    /* convert to RGB666, pack and output */
+    moveq.l #26, %d0
+    move.l  %acc0, %d4
+    move.l  %acc1, %d3
+    move.l  %acc2, %d2
+    lsr.l   %d0, %d4
+    lsr.l   %d0, %d3
+    lsr.l   %d0, %d2
+    
     lsl.l   #6, %d2
     or.l    %d3, %d2                /* |00000000|00000000|0000Rrrr|rrGggggg| */
     lsl.l   #7, %d2
@@ -171,24 +221,45 @@ lcd_write_yuv420_lines:
     move.w  %d4, (%a0)
     swap    %d4
 
+    /* luma for fourth pixel (bottom right) as delta from the thrid */
+    clr.l   %d2
+    move.b  (%a1)+, %d2
+    move.l  %d2, %d0
+    sub.l   %d1, %d0
+    mac.l   %a5, %d0, %acc0
+    mac.l   %a5, %d0, %acc1
+    mac.l   %a5, %d0, %acc2
+
+    move.w  %d4, (%a0)
+    /* 2nd LCD write is delayed one pixel to use it for filling the EMAC latency */
+
+    /* convert to RGB666, pack and output */
+    moveq.l #26, %d0
+    movclr.l %acc0, %d4
+    movclr.l %acc1, %d3
+    movclr.l %acc2, %d1
+    lsr.l   %d0, %d4
+    lsr.l   %d0, %d3
+    lsr.l   %d0, %d1
+
+    lsl.l   #6, %d1
+    or.l    %d3, %d1                /* |00000000|00000000|0000Rrrr|rrGggggg| */
+    lsl.l   #7, %d1
+    or.l    %d1, %d3                /* |00000000|00000Rrr|rrrGgggg|g0Gggggg| */
+    lsl.l   #6, %d3
+    or.l    %d3, %d4                /* |0000000R|rrrrrGgg|ggg0Gggg|ggBbbbbb| */
+    eor.l   %d7, %d4                /* |0000000r|rrrrrggg|ggg0gggg|ggbbbbbb| */
+    swap    %d4
+    move.w  %d4, (%a0)
+    swap    %d4
+
     cmp.l   %a1, %a4                /* run %a1 up to end of line */
     bhi.w   .yuv_line_loop
 
-    tst.l   (44+4, %sp)             /* use original Y pointer as a flag to */
-    beq.b   .yuv_exit               /* distinguish between first and second */
-    clr.l   (44+4, %sp)             /* pixel line */
-
-    /* Rewind chroma pointers */
-    movem.l (44+8, %sp), %a2-%a4    /* Cb data, Cr data, width */
-    lea.l   (%a1, %a4), %a4         /* end address */
-    bra.w   .yuv_line_loop
-    
-.yuv_exit:
     move.w  %d4, (%a0)              /* write (very) last 2nd word */
 
     movem.l (%sp), %d2-%d7/%a2-%a6
     lea.l   (44, %sp), %sp  /* restore registers */
-
     rts
 .yuv_end:
     .size   lcd_write_yuv420_lines, yuv_end - lcd_write_yuv420_lines
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
index 2cc5b5ba65..5ca2cb508c 100644
--- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
@@ -50,11 +50,6 @@ static unsigned short r_gate_scan_start_pos = 0x0002;
 static unsigned short r_drv_output_control  = 0x0313;
 static unsigned short r_horiz_ram_addr_pos  = 0x7f00;
 
-/* Dithering */
-#define R_ENTRY_MODE_SOLID  0x1038
-#define R_ENTRY_MODE_DIT    0x9038
-static unsigned short r_entry_mode = R_ENTRY_MODE_SOLID;
-
 /* Forward declarations */
 static void lcd_display_off(void);
 
@@ -97,6 +92,9 @@ static void lcd_display_off(void);
 #define R_GAMMA_AMP_ADJ_POS     0x3a
 #define R_GAMMA_AMP_ADJ_NEG     0x3b
 
+#define R_ENTRY_MODE_SOLID_VERT  0x1038
+#define R_ENTRY_MODE_DIT_HORZ    0x9030
+
 /* called very frequently - inline! */
 static inline void lcd_write_reg(int reg, int val)
 {
@@ -113,14 +111,6 @@ static inline void lcd_begin_write_gram(void)
     LCD_CMD = R_WRITE_DATA_2_GRAM << 1;
 }
 
-/* set hard dither mode on/off */
-static void hw_dither(bool on)
-{
-    /* DIT=x, BGR=1, HWM=0, I/D1-0=11, AM=1, LG2-0=000 */
-    r_entry_mode = on ? R_ENTRY_MODE_DIT : R_ENTRY_MODE_SOLID;
-    lcd_write_reg(R_ENTRY_MODE, r_entry_mode);
-}
-
 /*** hardware configuration ***/
 
 int lcd_default_contrast(void)
@@ -233,7 +223,7 @@ static void lcd_power_on(void)
     /* FLD1-0=01 (1 field), B/C=1, EOR=1 (C-pat), NW5-0=000000 (1 row) */
     lcd_write_reg(R_DRV_AC_CONTROL, 0x0700);
     /* DIT=x, BGR=1, HWM=0, I/D1-0=11, AM=1, LG2-0=000 */
-    lcd_write_reg(R_ENTRY_MODE, r_entry_mode);
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_SOLID_VERT);
     /* CP15-0=0000000000000000 */
     lcd_write_reg(R_COMPARE_REG, 0x0000);
     /* NO1-0=01, SDT1-0=00, EQ1-0=00, DIV1-0=00, RTN3-00000 */
@@ -377,7 +367,8 @@ void lcd_init_device(void)
     lcd_set_contrast(DEFAULT_CONTRAST_SETTING);
     lcd_set_invert_display(false);
     lcd_set_flip(false);
-    hw_dither(false); /* do this or all bootloaders will need reflashing */
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_SOLID_VERT);
+                 /* do this or all bootloaders will need reflashing */
 #endif
 }
 
@@ -432,13 +423,12 @@ void lcd_blit(const fb_data* data, int x, int by, int width,
 }
 
 /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420.
- * y should have two lines of Y back to back.
- * bu and rv should contain the Cb and Cr data for the two lines of Y.
+ * y should have two lines of Y back to back, 2nd line first.
+ * c should contain the Cb and Cr data for the two lines of Y back to back.
  * Needs EMAC set to saturated, signed integer mode.
  */
 extern void lcd_write_yuv420_lines(const unsigned char *y,
-                                   const unsigned char *bu,
-                                   const unsigned char *rv, int width);
+                                   const unsigned char *c, int width);
 
 /* Performance function to blit a YUV bitmap directly to the LCD
  * src_x, src_y, width and height should be even and within the LCD's
@@ -450,25 +440,19 @@ void lcd_yuv_blit(unsigned char * const src[3],
 {
     /* IRAM Y, Cb/bu, guv and Cb/rv buffers. */
     unsigned char y_ibuf[LCD_WIDTH*2];
-    unsigned char bu_ibuf[LCD_WIDTH/2];
-    unsigned char rv_ibuf[LCD_WIDTH/2];
+    unsigned char c_ibuf[LCD_WIDTH];
     const unsigned char *ysrc, *usrc, *vsrc;
     const unsigned char *ysrc_max;
 
     if (!display_on)
         return;
 
-    if (r_entry_mode == R_ENTRY_MODE_SOLID)
-        hw_dither(true);
-
     width &= ~1;  /* stay on the safe side */
-    height &= ~1;         
+    height &= ~1;
 
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_DIT_HORZ);
     /* Set start position and window */
-    lcd_write_reg(R_RAM_ADDR_SET, (x << 8) | (y + y_offset));
-    lcd_write_reg(R_VERT_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
-
-    lcd_begin_write_gram();
+    lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_WIDTH-1) << 8);
 
     ysrc = src[0] + src_y * stride + src_x;
     usrc = src[1] + (src_y * stride >> 2) + (src_x >> 1);
@@ -478,11 +462,17 @@ void lcd_yuv_blit(unsigned char * const src[3],
     coldfire_set_macsr(EMAC_SATURATE);
     do
     {
-        memcpy(y_ibuf, ysrc, width);
-        memcpy(y_ibuf + width, ysrc + stride, width);
-        memcpy(bu_ibuf, usrc, width >> 1);
-        memcpy(rv_ibuf, vsrc, width >> 1);
-        lcd_write_yuv420_lines(y_ibuf, bu_ibuf, rv_ibuf, width);
+        lcd_write_reg(R_HORIZ_RAM_ADDR_POS, ((y + y_offset + 1) << 8) | (y + y_offset));
+        lcd_write_reg(R_RAM_ADDR_SET, (x << 8) | (y + y_offset));
+        lcd_begin_write_gram();
+
+        memcpy(y_ibuf + width, ysrc, width);
+        memcpy(y_ibuf, ysrc + stride, width);
+        memcpy(c_ibuf, usrc, width >> 1);
+        memcpy(c_ibuf + (width >> 1), vsrc, width >> 1);
+        lcd_write_yuv420_lines(y_ibuf, c_ibuf, width >> 1);
+        
+        y += 2;
         ysrc += 2 * stride;
         usrc += stride >> 1;
         vsrc += stride >> 1;
@@ -499,17 +489,16 @@ void lcd_update(void)
     if (!display_on)
         return;
 
-    if (r_entry_mode == R_ENTRY_MODE_DIT)
-        hw_dither(false);
-
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_SOLID_VERT);
     /* Set start position and window */
-    lcd_write_reg(R_RAM_ADDR_SET, y_offset); /* X == 0 */
+    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 
+                  ((y_offset + LCD_HEIGHT-1) << 8) | y_offset);
     lcd_write_reg(R_VERT_RAM_ADDR_POS, (LCD_WIDTH-1) << 8);
+    lcd_write_reg(R_RAM_ADDR_SET, y_offset);
 
     lcd_begin_write_gram();
 
-    lcd_write_data((unsigned short *)lcd_framebuffer,
-        LCD_WIDTH*LCD_HEIGHT);
+    lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
 } /* lcd_update */
 
 /* Update a fraction of the display. */
@@ -521,9 +510,6 @@ void lcd_update_rect(int x, int y, int width, int height)
     if (!display_on)
         return;
 
-    if (r_entry_mode == R_ENTRY_MODE_DIT)
-        hw_dither(false);
-
     if (x + width > LCD_WIDTH)
         width = LCD_WIDTH - x; /* Clip right */
     if (x < 0)
@@ -539,9 +525,12 @@ void lcd_update_rect(int x, int y, int width, int height)
     if (y >= ymax)
         return; /* nothing left to do */
 
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_SOLID_VERT);
     /* Set start position and window */
-    lcd_write_reg(R_RAM_ADDR_SET, (x << 8) | (y + y_offset));
+    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 
+                  ((y_offset + LCD_HEIGHT-1) << 8) | y_offset);
     lcd_write_reg(R_VERT_RAM_ADDR_POS, ((x + width - 1) << 8) | x);
+    lcd_write_reg(R_RAM_ADDR_SET, (x << 8) | (y + y_offset));
 
     lcd_begin_write_gram();