Index: firmware/SOURCES =================================================================== --- firmware/SOURCES (revision 28807) +++ firmware/SOURCES (working copy) @@ -1504,6 +1504,7 @@ target/arm/s5l8700/dma-s5l8700.c target/arm/s5l8700/ipodnano2g/backlight-nano2g.c target/arm/s5l8700/ipodnano2g/lcd-nano2g.c +target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c target/arm/s5l8700/ipodnano2g/power-nano2g.c target/arm/s5l8700/ipodnano2g/ftl-nano2g.c Index: firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S =================================================================== --- firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S (revision 0) +++ firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S (revision 0) @@ -0,0 +1,254 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: lcd-as-video.S 26756 2010-06-11 04:41:36Z funman $ + * + * Copyright (C) 2010 by Andree Buschmann + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" + + .section .icode, "ax", %progbits + +/**************************************************************************** + * extern void lcd_write_yuv420_lines(unsigned char const * const src[3], + * unsigned LCD_BASE, + * int width, + * int stride); + * + * Conversion from Motion JPEG and MPEG Y'PbPr to RGB is: + * |R| |1.164 0.000 1.596| |Y' - 16| + * |G| = |1.164 -0.391 -0.813| |Pb - 128| + * |B| |1.164 2.018 0.000| |Pr - 128| + * + * Scaled, normalized, rounded and tweaked to yield RGB 565: + * |R| |74 0 101| |Y' - 16| >> 9 + * |G| = |74 -24 -51| |Cb - 128| >> 8 + * |B| |74 128 0| |Cr - 128| >> 9 + * + * Converts two lines from YUV to RGB565 and writes to LCD at once. First loop + * loads Cb/Cr, calculates the chroma offset and saves them to buffer. Within + * the second loop these chroma offset are reloaded from buffer. Within each + * loop two pixels are calculated and written to LCD. + */ + .align 2 + .global lcd_write_yuv420_lines + .type lcd_write_yuv420_lines, %function +lcd_write_yuv420_lines: + /* r0 = src = yuv_src */ + /* r1 = dst = LCD_BASE */ + /* r2 = width */ + /* r3 = stride */ + stmfd sp!, { r4-r10, lr } /* save non-scratch */ + ldmia r0, { r9, r10, r12 } /* r9 = yuv_src[0] = Y'_p */ + /* r10 = yuv_src[1] = Cb_p */ + /* r12 = yuv_src[2] = Cr_p */ + add r3, r9, r3 /* r3 = &ysrc[stride] */ + add r4, r2, r2, asr #1 /* chroma buffer lenght = width/2 *3 */ + mov r4, r4, asl #2 /* use words for str/ldm possibility */ + add r4, r4, #19 /* plus room for 4 additional words, */ + bic r4, r4, #3 /* rounded up to multiples of 4 byte */ + sub sp, sp, r4 /* and allocate on stack */ + stmia sp, {r1-r4} /* LCD_BASE, width, &ysrc[stride], stack_alloc */ + + mov r7, r2 /* r7 = loop count */ + add r8, sp, #16 /* chroma buffer */ + mov lr, r1 /* LCD data port = LCD_BASE */ + + /* 1st loop start */ +10: /* loop start */ + + ldrb r0, [r10], #1 /* r0 = *usrc++ = *Cb_p++ */ + ldrb r1, [r12], #1 /* r1 = *vsrc++ = *Cr_p++ */ + + sub r0, r0, #128 /* r0 = Cb-128 */ + sub r1, r1, #128 /* r1 = Cr-128 */ + + add r2, r1, r1, asl #1 /* r2 = Cr*51 + Cb*24 */ + add r2, r2, r2, asl #4 + add r2, r2, r0, asl #3 + add r2, r2, r0, asl #4 + + add r4, r1, r1, asl #2 /* r1 = Cr*101 */ + add r4, r4, r1, asl #5 + add r1, r4, r1, asl #6 + + add r1, r1, #256 /* r1 = rv = (r1 + 256) >> 9 */ + mov r1, r1, asr #9 + rsb r2, r2, #128 /* r2 = guv = (-r2 + 128) >> 8 */ + mov r2, r2, asr #8 + add r0, r0, #2 /* r0 = bu = (Cb*128 + 256) >> 9 */ + mov r0, r0, asr #2 + stmia r8!, {r0-r2} /* store r0, r1 and r2 to chroma buffer */ + + /* 1st loop, first pixel */ + ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ + sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ + add r3, r5, r5, asl #2 + add r5, r3, r5, asl #5 + + add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ + add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ + add r4, r0, r5, asr #8 /* r4 = b = (Y >> 9) + bu */ + + orr r5, r6, r4 /* check if clamping is needed... */ + orr r5, r5, r3, asr #1 /* ...at all */ + cmp r5, #31 + bls 15f /* -> no clamp */ + cmp r6, #31 /* clamp r */ + mvnhi r6, r6, asr #31 + andhi r6, r6, #31 + cmp r3, #63 /* clamp g */ + mvnhi r3, r3, asr #31 + andhi r3, r3, #63 + cmp r4, #31 /* clamp b */ + mvnhi r4, r4, asr #31 + andhi r4, r4, #31 +15: /* no clamp */ + + /* calculate pixel_1 and save to r5 for later pixel packing */ + orr r4, r4, r3, lsl #5 /* pixel_1 = r<<11 | g<<5 | b */ + orr r5, r4, r6, lsl #11 /* r5 = pixel_1 */ + + /* 1st loop, second pixel */ + ldrb r4, [r9], #1 /* r4 = *ysrc++ = *Y'_p++ */ + sub r4, r4, #16 /* r4 = (Y'-16) * 74 */ + add r3, r4, r4, asl #2 + add r4, r3, r4, asl #5 + + add r6, r1, r4, asr #8 /* r6 = r = (Y >> 9) + rv */ + add r3, r2, r4, asr #7 /* r3 = g = (Y >> 8) + guv */ + add r4, r0, r4, asr #8 /* r4 = b = (Y >> 9) + bu */ + + orr r0, r6, r4 /* check if clamping is needed... */ + orr r0, r0, r3, asr #1 /* ...at all */ + cmp r0, #31 + bls 15f /* -> no clamp */ + cmp r6, #31 /* clamp r */ + mvnhi r6, r6, asr #31 + andhi r6, r6, #31 + cmp r3, #63 /* clamp g */ + mvnhi r3, r3, asr #31 + andhi r3, r3, #63 + cmp r4, #31 /* clamp b */ + mvnhi r4, r4, asr #31 + andhi r4, r4, #31 +15: /* no clamp */ + + /* calculate pixel_2 and pack with pixel_1 before writing */ + orr r4, r4, r3, lsl #5 /* pixel_2 = r<<11 | g<<5 | b */ + orr r4, r4, r6, lsl #11 /* r4 = pixel_2 */ + + /* wait for FIFO half full */ +.fifo_wait1: + ldr r3, [lr, #0x1C] /* while (LCD_STATUS & 0x08); */ + tst r3, #0x8 + bgt .fifo_wait1 + + str r5, [lr, #0x40] /* write pixel_1 */ + str r4, [lr, #0x40] /* write pixel_2 */ + + subs r7, r7, #2 /* check for loop end */ + bgt 10b /* back to beginning */ + /* 1st loop end */ + + /* Reload several registers for pointer rewinding for next loop */ + add r8, sp, #16 /* chroma buffer */ + ldmia sp, { r1, r7, r9} /* r1 = LCD_BASE */ + /* r7 = loop count */ + /* r9 = &ysrc[stride] */ + + /* 2nd loop start */ +20: /* loop start */ + /* restore r0 (bu), r1 (rv) and r2 (guv) from chroma buffer */ + ldmia r8!, {r0-r2} + + /* 2nd loop, first pixel */ + ldrb r5, [r9], #1 /* r5 = *ysrc++ = *Y'_p++ */ + sub r5, r5, #16 /* r5 = (Y'-16) * 74 */ + add r3, r5, r5, asl #2 + add r5, r3, r5, asl #5 + + add r6, r1, r5, asr #8 /* r6 = r = (Y >> 9) + rv */ + add r3, r2, r5, asr #7 /* r3 = g = (Y >> 8) + guv */ + add r4, r0, r5, asr #8 /* r4 = b = (Y >> 9) + bu */ + + orr r5, r6, r4 /* check if clamping is needed... */ + orr r5, r5, r3, asr #1 /* ...at all */ + cmp r5, #31 + bls 15f /* -> no clamp */ + cmp r6, #31 /* clamp r */ + mvnhi r6, r6, asr #31 + andhi r6, r6, #31 + cmp r3, #63 /* clamp g */ + mvnhi r3, r3, asr #31 + andhi r3, r3, #63 + cmp r4, #31 /* clamp b */ + mvnhi r4, r4, asr #31 + andhi r4, r4, #31 +15: /* no clamp */ + /* calculate pixel_1 and save to r5 for later pixel packing */ + orr r4, r4, r3, lsl #5 /* pixel_1 = r<<11 | g<<5 | b */ + orr r5, r4, r6, lsl #11 /* r5 = pixel_1 */ + + /* 2nd loop, second pixel */ + ldrb r4, [r9], #1 /* r4 = *ysrc++ = *Y'_p++ */ + sub r4, r4, #16 /* r4 = (Y'-16) * 74 */ + add r3, r4, r4, asl #2 + add r4, r3, r4, asl #5 + + add r6, r1, r4, asr #8 /* r6 = r = (Y >> 9) + rv */ + add r3, r2, r4, asr #7 /* r3 = g = (Y >> 8) + guv */ + add r4, r0, r4, asr #8 /* r4 = b = (Y >> 9) + bu */ + + orr r0, r6, r4 /* check if clamping is needed... */ + orr r0, r0, r3, asr #1 /* ...at all */ + cmp r0, #31 + bls 15f /* -> no clamp */ + cmp r6, #31 /* clamp r */ + mvnhi r6, r6, asr #31 + andhi r6, r6, #31 + cmp r3, #63 /* clamp g */ + mvnhi r3, r3, asr #31 + andhi r3, r3, #63 + cmp r4, #31 /* clamp b */ + mvnhi r4, r4, asr #31 + andhi r4, r4, #31 +15: /* no clamp */ + + /* calculate pixel_2 and pack with pixel_1 before writing */ + orr r4, r4, r3, lsl #5 /* pixel_2 = r<<11 | g<<5 | b */ + orr r4, r4, r6, lsl #11 /* r4 = pixel_2 */ + + /* wait for FIFO half full */ +.fifo_wait2: + ldr r3, [lr, #0x1C] /* while (LCD_STATUS & 0x08); */ + tst r3, #0x8 + bgt .fifo_wait2 + + str r5, [lr, #0x40] /* write pixel_1 */ + str r4, [lr, #0x40] /* write pixel_2 */ + + subs r7, r7, #2 /* check for loop end */ + bgt 20b /* back to beginning */ + /* 2nd loop end */ + + ldr r3, [sp, #12] + add sp, sp, r3 /* deallocate buffer */ + ldmpc regs=r4-r10 /* restore registers */ + + .ltorg + .size lcd_write_yuv420_lines, .-lcd_write_yuv420_lines Property changes on: firmware/target/arm/s5l8700/ipodnano2g/lcd-asm-nano2g.S ___________________________________________________________________ Added: svn:executable + * Index: firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c =================================================================== --- firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c (revision 28807) +++ firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c (working copy) @@ -67,149 +67,82 @@ #ifdef HAVE_LCD_SLEEP #define SLEEP 0 -#define CMD8 1 -#define CMD16 2 -#define DATA8 3 -#define DATA16 4 +#define CMD16 1 +#define DATA16 2 unsigned short lcd_init_sequence_0[] = { - CMD16, 0x00a4, - DATA16, 0x0001, + CMD16, 0x00a4, DATA16, 0x0001, SLEEP, 0x0000, - CMD16, 0x0001, - DATA16, 0x0100, - CMD16, 0x0002, - DATA16, 0x0300, - CMD16, 0x0003, - DATA16, 0x1230, - CMD16, 0x0008, - DATA16, 0x0404, - CMD16, 0x0008, - DATA16, 0x0404, - CMD16, 0x000e, - DATA16, 0x0010, - CMD16, 0x0070, - DATA16, 0x1000, - CMD16, 0x0071, - DATA16, 0x0001, - CMD16, 0x0030, - DATA16, 0x0002, - CMD16, 0x0031, - DATA16, 0x0400, - CMD16, 0x0032, - DATA16, 0x0007, - CMD16, 0x0033, - DATA16, 0x0500, - CMD16, 0x0034, - DATA16, 0x0007, - CMD16, 0x0035, - DATA16, 0x0703, - CMD16, 0x0036, - DATA16, 0x0507, - CMD16, 0x0037, - DATA16, 0x0005, - CMD16, 0x0038, - DATA16, 0x0407, - CMD16, 0x0039, - DATA16, 0x000e, - CMD16, 0x0040, - DATA16, 0x0202, - CMD16, 0x0041, - DATA16, 0x0003, - CMD16, 0x0042, - DATA16, 0x0000, - CMD16, 0x0043, - DATA16, 0x0200, - CMD16, 0x0044, - DATA16, 0x0707, - CMD16, 0x0045, - DATA16, 0x0407, - CMD16, 0x0046, - DATA16, 0x0505, - CMD16, 0x0047, - DATA16, 0x0002, - CMD16, 0x0048, - DATA16, 0x0004, - CMD16, 0x0049, - DATA16, 0x0004, - CMD16, 0x0060, - DATA16, 0x0202, - CMD16, 0x0061, - DATA16, 0x0003, - CMD16, 0x0062, - DATA16, 0x0000, - CMD16, 0x0063, - DATA16, 0x0200, - CMD16, 0x0064, - DATA16, 0x0707, - CMD16, 0x0065, - DATA16, 0x0407, - CMD16, 0x0066, - DATA16, 0x0505, - CMD16, 0x0068, - DATA16, 0x0004, - CMD16, 0x0069, - DATA16, 0x0004, - CMD16, 0x0007, - DATA16, 0x0001, - CMD16, 0x0018, - DATA16, 0x0001, - CMD16, 0x0010, - DATA16, 0x1690, - CMD16, 0x0011, - DATA16, 0x0100, - CMD16, 0x0012, - DATA16, 0x0117, - CMD16, 0x0013, - DATA16, 0x0f80, - CMD16, 0x0012, - DATA16, 0x0137, - CMD16, 0x0020, - DATA16, 0x0000, - CMD16, 0x0021, - DATA16, 0x0000, - CMD16, 0x0050, - DATA16, 0x0000, - CMD16, 0x0051, - DATA16, 0x00af, - CMD16, 0x0052, - DATA16, 0x0000, - CMD16, 0x0053, - DATA16, 0x0083, - CMD16, 0x0090, - DATA16, 0x0003, - CMD16, 0x0091, - DATA16, 0x0000, - CMD16, 0x0092, - DATA16, 0x0101, - CMD16, 0x0098, - DATA16, 0x0400, - CMD16, 0x0099, - DATA16, 0x1302, - CMD16, 0x009a, - DATA16, 0x0202, - CMD16, 0x009b, - DATA16, 0x0200, + CMD16, 0x0001, DATA16, 0x0100, + CMD16, 0x0002, DATA16, 0x0300, + CMD16, 0x0003, DATA16, 0x1230, + CMD16, 0x0008, DATA16, 0x0404, + CMD16, 0x0008, DATA16, 0x0404, + CMD16, 0x000e, DATA16, 0x0010, + CMD16, 0x0070, DATA16, 0x1000, + CMD16, 0x0071, DATA16, 0x0001, + CMD16, 0x0030, DATA16, 0x0002, + CMD16, 0x0031, DATA16, 0x0400, + CMD16, 0x0032, DATA16, 0x0007, + CMD16, 0x0033, DATA16, 0x0500, + CMD16, 0x0034, DATA16, 0x0007, + CMD16, 0x0035, DATA16, 0x0703, + CMD16, 0x0036, DATA16, 0x0507, + CMD16, 0x0037, DATA16, 0x0005, + CMD16, 0x0038, DATA16, 0x0407, + CMD16, 0x0039, DATA16, 0x000e, + CMD16, 0x0040, DATA16, 0x0202, + CMD16, 0x0041, DATA16, 0x0003, + CMD16, 0x0042, DATA16, 0x0000, + CMD16, 0x0043, DATA16, 0x0200, + CMD16, 0x0044, DATA16, 0x0707, + CMD16, 0x0045, DATA16, 0x0407, + CMD16, 0x0046, DATA16, 0x0505, + CMD16, 0x0047, DATA16, 0x0002, + CMD16, 0x0048, DATA16, 0x0004, + CMD16, 0x0049, DATA16, 0x0004, + CMD16, 0x0060, DATA16, 0x0202, + CMD16, 0x0061, DATA16, 0x0003, + CMD16, 0x0062, DATA16, 0x0000, + CMD16, 0x0063, DATA16, 0x0200, + CMD16, 0x0064, DATA16, 0x0707, + CMD16, 0x0065, DATA16, 0x0407, + CMD16, 0x0066, DATA16, 0x0505, + CMD16, 0x0068, DATA16, 0x0004, + CMD16, 0x0069, DATA16, 0x0004, + CMD16, 0x0007, DATA16, 0x0001, + CMD16, 0x0018, DATA16, 0x0001, + CMD16, 0x0010, DATA16, 0x1690, + CMD16, 0x0011, DATA16, 0x0100, + CMD16, 0x0012, DATA16, 0x0117, + CMD16, 0x0013, DATA16, 0x0f80, + CMD16, 0x0012, DATA16, 0x0137, + CMD16, 0x0020, DATA16, 0x0000, + CMD16, 0x0021, DATA16, 0x0000, + CMD16, 0x0050, DATA16, 0x0000, + CMD16, 0x0051, DATA16, 0x00af, + CMD16, 0x0052, DATA16, 0x0000, + CMD16, 0x0053, DATA16, 0x0083, + CMD16, 0x0090, DATA16, 0x0003, + CMD16, 0x0091, DATA16, 0x0000, + CMD16, 0x0092, DATA16, 0x0101, + CMD16, 0x0098, DATA16, 0x0400, + CMD16, 0x0099, DATA16, 0x1302, + CMD16, 0x009a, DATA16, 0x0202, + CMD16, 0x009b, DATA16, 0x0200, SLEEP, 0x0000, - CMD16, 0x0007, - DATA16, 0x0021, - CMD16, 0x0012, - DATA16, 0x0137, + CMD16, 0x0007, DATA16, 0x0021, + CMD16, 0x0012, DATA16, 0x0137, SLEEP, 0x0000, - CMD16, 0x0007, - DATA16, 0x0021, - CMD16, 0x0012, - DATA16, 0x1137, + CMD16, 0x0007, DATA16, 0x0021, + CMD16, 0x0012, DATA16, 0x1137, SLEEP, 0x0000, - CMD16, 0x0007, - DATA16, 0x0233, + CMD16, 0x0007, DATA16, 0x0233, }; unsigned short lcd_init_sequence_1[] = { - CMD8, 0x11, - DATA16, 0x00, - CMD8, 0x29, - DATA16, 0x00, + CMD16, 0x0011, DATA16, 0x0000, + CMD16, 0x0029, DATA16, 0x0000, }; @@ -219,14 +152,10 @@ static inline void s5l_lcd_write_cmd_data(int cmd, int data) { while (LCD_STATUS & 0x10); - LCD_WCMD = cmd >> 8; - while (LCD_STATUS & 0x10); - LCD_WCMD = cmd & 0xff; + LCD_WCMD = cmd; while (LCD_STATUS & 0x10); - LCD_WDATA = data >> 8; - while (LCD_STATUS & 0x10); - LCD_WDATA = data & 0xff; + LCD_WDATA = data; } static inline void s5l_lcd_write_cmd(unsigned short cmd) @@ -235,28 +164,12 @@ LCD_WCMD = cmd; } -static inline void s5l_lcd_write_wcmd(unsigned short cmd) -{ - while (LCD_STATUS & 0x10); - LCD_WCMD = cmd >> 8; - while (LCD_STATUS & 0x10); - LCD_WCMD = cmd & 0xff; -} - static inline void s5l_lcd_write_data(unsigned short data) { while (LCD_STATUS & 0x10); - LCD_WDATA = data & 0xff; + LCD_WDATA = data; } -static inline void s5l_lcd_write_wdata(unsigned short data) -{ - while (LCD_STATUS & 0x10); - LCD_WDATA = data >> 8; - while (LCD_STATUS & 0x10); - LCD_WDATA = data & 0xff; -} - /*** hardware configuration ***/ int lcd_default_contrast(void) @@ -331,18 +244,12 @@ { switch(lcd_init_sequence[i]) { - case CMD8: + case CMD16: s5l_lcd_write_cmd(lcd_init_sequence[i+1]); break; - case DATA8: + case DATA16: s5l_lcd_write_data(lcd_init_sequence[i+1]); break; - case CMD16: - s5l_lcd_write_wcmd(lcd_init_sequence[i+1]); - break; - case DATA16: - s5l_lcd_write_wdata(lcd_init_sequence[i+1]); - break; case SLEEP: sleep(lcd_init_sequence[i+1]); break; @@ -367,24 +274,24 @@ if (lcd_type == 0) { - s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x232); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_3, 0x1137); - s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x201); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_3, 0x137); - s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x200); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_1, 0x680); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_2, 0x160); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_3, 0x127); - s5l_lcd_write_cmd_data(R_POWER_CONTROL_1, 0x600); + s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x0232); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_3 , 0x1137); + s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x0201); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_3 , 0x0137); + s5l_lcd_write_cmd_data(R_DISPLAY_CONTROL_1, 0x0200); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_1 , 0x0680); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_2 , 0x0160); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_3 , 0x0127); + s5l_lcd_write_cmd_data(R_POWER_CONTROL_1 , 0x0600); } else { s5l_lcd_write_cmd(R_DISPLAY_OFF); - s5l_lcd_write_wdata(0); - s5l_lcd_write_wdata(0); + s5l_lcd_write_data(0); + s5l_lcd_write_data(0); s5l_lcd_write_cmd(R_SLEEP_IN); - s5l_lcd_write_wdata(0); - s5l_lcd_write_wdata(0); + s5l_lcd_write_data(0); + s5l_lcd_write_data(0); } PWRCONEXT |= 0x80; @@ -409,6 +316,8 @@ lcd_type = 0; /* Similar to ILI9320 - aka "type 2" */ else lcd_type = 1; /* Similar to LDS176 - aka "type 7" */ + + LCD_CON |= 0x100; /* use 16 bit bus width, little endian */ lcd_ispowered = true; } @@ -417,10 +326,7 @@ static inline void lcd_write_pixel(fb_data pixel) { - while (LCD_STATUS & 0x10); - LCD_WDATA = (pixel & 0xff00) >> 8; - while (LCD_STATUS & 0x10); - LCD_WDATA = pixel & 0xff; + LCD_WDATA = pixel; } /* Update the display. @@ -435,9 +341,10 @@ void lcd_update_rect(int, int, int, int) ICODE_ATTR; void lcd_update_rect(int x, int y, int width, int height) { - int xx,yy; int y0, x0, y1, x1; fb_data* p; + + width = (width + 1) & ~1; /* ensure width is even */ x0 = x; /* start horiz */ y0 = y; /* start vert */ @@ -457,71 +364,58 @@ s5l_lcd_write_cmd(R_WRITE_DATA_TO_GRAM); } else { s5l_lcd_write_cmd(R_COLUMN_ADDR_SET); - s5l_lcd_write_wdata(x0); /* Start column */ - s5l_lcd_write_wdata(x1); /* End column */ + s5l_lcd_write_data(x0); /* Start column */ + s5l_lcd_write_data(x1); /* End column */ s5l_lcd_write_cmd(R_ROW_ADDR_SET); - s5l_lcd_write_wdata(y0); /* Start row */ - s5l_lcd_write_wdata(y1); /* End row */ + s5l_lcd_write_data(y0); /* Start row */ + s5l_lcd_write_data(y1); /* End row */ s5l_lcd_write_cmd(R_MEMORY_WRITE); } - /* Copy display bitmap to hardware */ p = &lcd_framebuffer[y0][x0]; - yy = height; - for (yy = y0; yy <= y1; yy++) { - for (xx = x0; xx <= x1; xx++) { + if (LCD_WIDTH == width) + { + x1 = height*LCD_WIDTH/4; + do { + while (LCD_STATUS & 0x08); /* wait while FIFO is half full */ lcd_write_pixel(*(p++)); - } - p += LCD_WIDTH - width; + lcd_write_pixel(*(p++)); + lcd_write_pixel(*(p++)); + lcd_write_pixel(*(p++)); + } while (--x1 > 0); + } else { + y1 = height; + do { + x1 = width/2; /* width is forced to even to allow speed up */ + do { + while (LCD_STATUS & 0x08); /* wait while FIFO is half full */ + lcd_write_pixel(*(p++)); + lcd_write_pixel(*(p++)); + } while (--x1 > 0 ); + p += LCD_WIDTH - width; + } while (--y1 > 0 ); } } -/*** update functions ***/ +/* Line write helper function for lcd_yuv_blit. Writes two lines of yuv420. */ +extern void lcd_write_yuv420_lines(unsigned char const * const src[3], + unsigned lcd_baseadress, + int width, + int stride); -#define CSUB_X 2 -#define CSUB_Y 2 - -/* YUV- > RGB565 conversion - * |R| |1.000000 -0.000001 1.402000| |Y'| - * |G| = |1.000000 -0.334136 -0.714136| |Pb| - * |B| |1.000000 1.772000 0.000000| |Pr| - * Scaled, normalized, rounded and tweaked to yield RGB 565: - * |R| |74 0 101| |Y' - 16| >> 9 - * |G| = |74 -24 -51| |Cb - 128| >> 8 - * |B| |74 128 0| |Cr - 128| >> 9 -*/ - -#define RGBYFAC 74 /* 1.0 */ -#define RVFAC 101 /* 1.402 */ -#define GVFAC (-51) /* -0.714136 */ -#define GUFAC (-24) /* -0.334136 */ -#define BUFAC 128 /* 1.772 */ - -/* ROUNDOFFS contain constant for correct round-offs as well as - constant parts of the conversion matrix (e.g. (Y'-16)*RGBYFAC - -> constant part = -16*RGBYFAC). Through extraction of these - constant parts we save at leat 4 substractions in the conversion - loop */ -#define ROUNDOFFSR (256 - 16*RGBYFAC - 128*RVFAC) -#define ROUNDOFFSG (128 - 16*RGBYFAC - 128*GVFAC - 128*GUFAC) -#define ROUNDOFFSB (256 - 16*RGBYFAC - 128*BUFAC) - -#define MAX_5BIT 0x1f -#define MAX_6BIT 0x3f - -/* Performance function to blit a YUV bitmap directly to the LCD */ +/* Blit a YUV bitmap directly to the LCD */ void lcd_blit_yuv(unsigned char * const src[3], int src_x, int src_y, int stride, int x, int y, int width, int height) { - int h; - int y0, x0, y1, x1; + unsigned int z, y0, x0, y1, x1;; + unsigned char const * yuv_src[3]; + + width = (width + 1) & ~1; /* ensure width is even */ - width = (width + 1) & ~1; - x0 = x; /* start horiz */ y0 = y; /* start vert */ x1 = (x + width) - 1; /* max horiz */ @@ -540,88 +434,27 @@ s5l_lcd_write_cmd(R_WRITE_DATA_TO_GRAM); } else { s5l_lcd_write_cmd(R_COLUMN_ADDR_SET); - s5l_lcd_write_wdata(x0); /* Start column */ - s5l_lcd_write_wdata(x1); /* End column */ + s5l_lcd_write_data(x0); /* Start column */ + s5l_lcd_write_data(x1); /* End column */ s5l_lcd_write_cmd(R_ROW_ADDR_SET); - s5l_lcd_write_wdata(y0); /* Start row */ - s5l_lcd_write_wdata(y1); /* End row */ + s5l_lcd_write_data(y0); /* Start row */ + s5l_lcd_write_data(y1); /* End row */ s5l_lcd_write_cmd(R_MEMORY_WRITE); } - const int stride_div_csub_x = stride/CSUB_X; + z = stride * src_y; + yuv_src[0] = src[0] + z + src_x; + yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1); + yuv_src[2] = src[2] + (yuv_src[1] - src[1]); - h = height; - while (h > 0) { - /* upsampling, YUV->RGB conversion and reduction to RGB565 in one go */ - const unsigned char *ysrc = src[0] + stride * src_y + src_x; + height >>= 1; - const int uvoffset = stride_div_csub_x * (src_y/CSUB_Y) + - (src_x/CSUB_X); - - const unsigned char *usrc = src[1] + uvoffset; - const unsigned char *vsrc = src[2] + uvoffset; - const unsigned char *row_end = ysrc + width; - - int yp, up, vp; - int red1, green1, blue1; - int red2, green2, blue2; - - int rc, gc, bc; - - do - { - up = *usrc++; - vp = *vsrc++; - rc = RVFAC * vp + ROUNDOFFSR; - gc = GVFAC * vp + GUFAC * up + ROUNDOFFSG; - bc = BUFAC * up + ROUNDOFFSB; - - /* Pixel 1 -> RGB565 */ - yp = *ysrc++ * RGBYFAC; - red1 = (yp + rc) >> 9; - green1 = (yp + gc) >> 8; - blue1 = (yp + bc) >> 9; - - /* Pixel 2 -> RGB565 */ - yp = *ysrc++ * RGBYFAC; - red2 = (yp + rc) >> 9; - green2 = (yp + gc) >> 8; - blue2 = (yp + bc) >> 9; - - /* Since out of bounds errors are relatively rare, we check two - pixels at once to see if any components are out of bounds, and - then fix whichever is broken. This works due to high values and - negative values both being !=0 when bitmasking them. - We first check for red and blue components (5bit range). */ - if ((red1 | blue1 | red2 | blue2) & ~MAX_5BIT) - { - if (red1 & ~MAX_5BIT) - red1 = (red1 >> 31) ? 0 : MAX_5BIT; - if (blue1 & ~MAX_5BIT) - blue1 = (blue1 >> 31) ? 0 : MAX_5BIT; - if (red2 & ~MAX_5BIT) - red2 = (red2 >> 31) ? 0 : MAX_5BIT; - if (blue2 & ~MAX_5BIT) - blue2 = (blue2 >> 31) ? 0 : MAX_5BIT; - } - /* We second check for green component (6bit range) */ - if ((green1 | green2) & ~MAX_6BIT) - { - if (green1 & ~MAX_6BIT) - green1 = (green1 >> 31) ? 0 : MAX_6BIT; - if (green2 & ~MAX_6BIT) - green2 = (green2 >> 31) ? 0 : MAX_6BIT; - } - - /* output 2 pixels */ - lcd_write_pixel((red1 << 11) | (green1 << 5) | blue1); - lcd_write_pixel((red2 << 11) | (green2 << 5) | blue2); - } - while (ysrc < row_end); - - src_y++; - h--; - } + do { + lcd_write_yuv420_lines(yuv_src, LCD_BASE, width, stride); + yuv_src[0] += stride << 1; + yuv_src[1] += stride >> 1; /* Skip down one chroma line */ + yuv_src[2] += stride >> 1; + } while (--height > 0); }