diff options
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-as-h300.S | 129 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-h300.c | 45 |
2 files changed, 121 insertions, 53 deletions
diff --git a/firmware/target/coldfire/iriver/h300/lcd-as-h300.S b/firmware/target/coldfire/iriver/h300/lcd-as-h300.S index 1873b905c6..9106e22c1c 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-as-h300.S +++ b/firmware/target/coldfire/iriver/h300/lcd-as-h300.S | |||
@@ -44,6 +44,23 @@ | |||
44 | * |B| |19611723 33976259 0| |Cr - 128| >> 27 | 44 | * |B| |19611723 33976259 0| |Cr - 128| >> 27 |
45 | * | 45 | * |
46 | * Needs EMAC set to saturated, signed integer mode. | 46 | * Needs EMAC set to saturated, signed integer mode. |
47 | * | ||
48 | * register usage: | ||
49 | * %a0 - LCD data port | ||
50 | * %a1 - Y pointer | ||
51 | * %a2 - C pointer | ||
52 | * %a3 - C width | ||
53 | * %a4 - Y end address | ||
54 | * %a5 - Y factor | ||
55 | * %a6 - BU factor | ||
56 | * %d0 - scratch | ||
57 | * %d1 - B, previous Y \ alternating | ||
58 | * %d2 - U / B, previous Y / | ||
59 | * %d3 - V / G | ||
60 | * %d4 - R / output pixel | ||
61 | * %d5 - GU factor | ||
62 | * %d6 - GV factor | ||
63 | * %d7 - RGB signed -> unsigned conversion mask | ||
47 | */ | 64 | */ |
48 | .align 2 | 65 | .align 2 |
49 | .global lcd_write_yuv420_lines | 66 | .global lcd_write_yuv420_lines |
@@ -52,10 +69,10 @@ | |||
52 | lcd_write_yuv420_lines: | 69 | lcd_write_yuv420_lines: |
53 | lea.l (-44, %sp), %sp /* free up some registers */ | 70 | lea.l (-44, %sp), %sp /* free up some registers */ |
54 | movem.l %d2-%d7/%a2-%a6, (%sp) | 71 | movem.l %d2-%d7/%a2-%a6, (%sp) |
55 | 72 | ||
56 | lea.l 0xf0000002, %a0 /* LCD data port */ | 73 | lea.l 0xf0000002, %a0 /* LCD data port */ |
57 | movem.l (44+4, %sp), %a1-%a4 /* Y data, Cb data, Cr data, width */ | 74 | movem.l (44+4, %sp), %a1-%a3 /* Y data, C data, C width */ |
58 | lea.l (%a1, %a4), %a4 /* end address */ | 75 | lea.l (%a1, %a3*2), %a4 /* Y end address */ |
59 | 76 | ||
60 | move.l #19611723, %a5 /* y factor */ | 77 | move.l #19611723, %a5 /* y factor */ |
61 | move.l #33976259, %a6 /* bu factor */ | 78 | move.l #33976259, %a6 /* bu factor */ |
@@ -64,11 +81,11 @@ lcd_write_yuv420_lines: | |||
64 | move.l #0x8410, %d7 /* bitmask for signed->unsigned conversion | 81 | move.l #0x8410, %d7 /* bitmask for signed->unsigned conversion |
65 | * of R, G and B within RGB565 at once */ | 82 | * of R, G and B within RGB565 at once */ |
66 | 83 | ||
67 | /* chroma for (very) first & second pixel */ | 84 | /* chroma for first 2x2 pixel block */ |
85 | clr.l %d3 /* load v component */ | ||
86 | move.b (%a2, %a3), %d3 | ||
68 | clr.l %d2 /* load u component */ | 87 | clr.l %d2 /* load u component */ |
69 | move.b (%a2)+, %d2 | 88 | move.b (%a2)+, %d2 |
70 | clr.l %d3 /* load v component */ | ||
71 | move.b (%a3)+, %d3 | ||
72 | moveq.l #-128, %d0 | 89 | moveq.l #-128, %d0 |
73 | add.l %d0, %d2 | 90 | add.l %d0, %d2 |
74 | add.l %d0, %d3 | 91 | add.l %d0, %d3 |
@@ -79,9 +96,9 @@ lcd_write_yuv420_lines: | |||
79 | move.l #26881894, %d0 /* rv factor */ | 96 | move.l #26881894, %d0 /* rv factor */ |
80 | mac.l %d0, %d3, %acc2 /* rv */ | 97 | mac.l %d0, %d3, %acc2 /* rv */ |
81 | 98 | ||
82 | /* luma for (very) first pixel */ | 99 | /* luma for very first pixel (top left) */ |
83 | clr.l %d1 | 100 | clr.l %d1 |
84 | move.b (%a1)+, %d1 | 101 | move.b (%a1, %a3*2), %d1 |
85 | moveq.l #-126, %d0 | 102 | moveq.l #-126, %d0 |
86 | add.l %d1, %d0 /* y' (-0.5 ... +0.5) */ | 103 | add.l %d1, %d0 /* y' (-0.5 ... +0.5) */ |
87 | mac.l %a5, %d0, %acc0 | 104 | mac.l %a5, %d0, %acc0 |
@@ -91,11 +108,11 @@ lcd_write_yuv420_lines: | |||
91 | bra.b .yuv_line_entry | 108 | bra.b .yuv_line_entry |
92 | 109 | ||
93 | .yuv_line_loop: | 110 | .yuv_line_loop: |
94 | /* chroma for first & second pixel */ | 111 | /* chroma for 2x2 pixel block */ |
112 | clr.l %d3 /* load v component */ | ||
113 | move.b (%a2, %a3), %d3 | ||
95 | clr.l %d2 /* load u component */ | 114 | clr.l %d2 /* load u component */ |
96 | move.b (%a2)+, %d2 | 115 | move.b (%a2)+, %d2 |
97 | clr.l %d3 /* load v component */ | ||
98 | move.b (%a3)+, %d3 | ||
99 | moveq.l #-128, %d0 | 116 | moveq.l #-128, %d0 |
100 | add.l %d0, %d2 | 117 | add.l %d0, %d2 |
101 | add.l %d0, %d3 | 118 | add.l %d0, %d3 |
@@ -106,16 +123,16 @@ lcd_write_yuv420_lines: | |||
106 | move.l #26881894, %d0 /* rv factor */ | 123 | move.l #26881894, %d0 /* rv factor */ |
107 | mac.l %d0, %d3, %acc2 /* rv */ | 124 | mac.l %d0, %d3, %acc2 /* rv */ |
108 | 125 | ||
109 | /* luma for first pixel */ | 126 | /* luma for first pixel (top left) */ |
110 | clr.l %d1 | 127 | clr.l %d1 |
111 | move.b (%a1)+, %d1 | 128 | move.b (%a1, %a3*2), %d1 |
112 | moveq.l #-126, %d0 | 129 | moveq.l #-126, %d0 |
113 | add.l %d1, %d0 /* y' (-0.5 ... +0.5) */ | 130 | add.l %d1, %d0 /* y' (-0.5 ... +0.5) */ |
114 | mac.l %a5, %d0, %acc0 | 131 | mac.l %a5, %d0, %acc0 |
115 | mac.l %a5, %d0, %acc1 | 132 | mac.l %a5, %d0, %acc1 |
116 | mac.l %a5, %d0, %acc2 | 133 | mac.l %a5, %d0, %acc2 |
117 | 134 | ||
118 | move.w %d4, (%a0) | 135 | move.w %d4, (%a0) |
119 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ | 136 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ |
120 | 137 | ||
121 | /* convert to RGB565, pack and output */ | 138 | /* convert to RGB565, pack and output */ |
@@ -134,22 +151,50 @@ lcd_write_yuv420_lines: | |||
134 | or.l %d2, %d4 | 151 | or.l %d2, %d4 |
135 | eor.l %d7, %d4 | 152 | eor.l %d7, %d4 |
136 | 153 | ||
137 | /* luma for second pixel as delta from the first */ | 154 | /* luma for second pixel (bottom left) as delta from the first */ |
138 | clr.l %d0 | 155 | clr.l %d2 |
139 | move.b (%a1)+, %d0 | 156 | move.b (%a1)+, %d2 |
157 | move.l %d2, %d0 | ||
140 | sub.l %d1, %d0 | 158 | sub.l %d1, %d0 |
141 | mac.l %a5, %d0, %acc0 | 159 | mac.l %a5, %d0, %acc0 |
142 | mac.l %a5, %d0, %acc1 | 160 | mac.l %a5, %d0, %acc1 |
143 | mac.l %a5, %d0, %acc2 | 161 | mac.l %a5, %d0, %acc2 |
144 | 162 | ||
145 | move.w %d4, (%a0) | 163 | move.w %d4, (%a0) |
146 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ | 164 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ |
147 | 165 | ||
148 | /* convert to RGB565, pack and output */ | 166 | /* convert to RGB565, pack and output */ |
149 | moveq.l #27, %d0 | 167 | moveq.l #27, %d0 |
150 | movclr.l %acc0, %d2 | 168 | move.l %acc0, %d1 |
151 | movclr.l %acc1, %d3 | 169 | move.l %acc1, %d3 |
152 | movclr.l %acc2, %d4 | 170 | move.l %acc2, %d4 |
171 | lsr.l %d0, %d1 | ||
172 | lsr.l %d0, %d4 | ||
173 | moveq.l #26, %d0 | ||
174 | lsr.l %d0, %d3 | ||
175 | lsl.l #6, %d4 | ||
176 | or.l %d3, %d4 | ||
177 | lsl.l #5, %d4 | ||
178 | or.l %d1, %d4 | ||
179 | eor.l %d7, %d4 | ||
180 | |||
181 | /* luma for third pixel (top right) as delta from the second */ | ||
182 | clr.l %d1 | ||
183 | move.b (%a1, %a3*2), %d1 | ||
184 | move.l %d1, %d0 | ||
185 | sub.l %d2, %d0 | ||
186 | mac.l %a5, %d0, %acc0 | ||
187 | mac.l %a5, %d0, %acc1 | ||
188 | mac.l %a5, %d0, %acc2 | ||
189 | |||
190 | move.w %d4, (%a0) | ||
191 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ | ||
192 | |||
193 | /* convert to RGB565, pack and output */ | ||
194 | moveq.l #27, %d0 | ||
195 | move.l %acc0, %d2 | ||
196 | move.l %acc1, %d3 | ||
197 | move.l %acc2, %d4 | ||
153 | lsr.l %d0, %d2 | 198 | lsr.l %d0, %d2 |
154 | lsr.l %d0, %d4 | 199 | lsr.l %d0, %d4 |
155 | moveq.l #26, %d0 | 200 | moveq.l #26, %d0 |
@@ -160,24 +205,40 @@ lcd_write_yuv420_lines: | |||
160 | or.l %d2, %d4 | 205 | or.l %d2, %d4 |
161 | eor.l %d7, %d4 | 206 | eor.l %d7, %d4 |
162 | 207 | ||
208 | /* luma for fourth pixel (bottom right) as delta from the third */ | ||
209 | clr.l %d2 | ||
210 | move.b (%a1)+, %d2 | ||
211 | move.l %d2, %d0 | ||
212 | sub.l %d1, %d0 | ||
213 | mac.l %a5, %d0, %acc0 | ||
214 | mac.l %a5, %d0, %acc1 | ||
215 | mac.l %a5, %d0, %acc2 | ||
216 | |||
217 | move.w %d4, (%a0) | ||
218 | /* LCD write is delayed one pixel to use it for filling the EMAC latency */ | ||
219 | |||
220 | /* convert to RGB565, pack and output */ | ||
221 | moveq.l #27, %d0 | ||
222 | movclr.l %acc0, %d1 | ||
223 | movclr.l %acc1, %d3 | ||
224 | movclr.l %acc2, %d4 | ||
225 | lsr.l %d0, %d1 | ||
226 | lsr.l %d0, %d4 | ||
227 | moveq.l #26, %d0 | ||
228 | lsr.l %d0, %d3 | ||
229 | lsl.l #6, %d4 | ||
230 | or.l %d3, %d4 | ||
231 | lsl.l #5, %d4 | ||
232 | or.l %d1, %d4 | ||
233 | eor.l %d7, %d4 | ||
234 | |||
163 | cmp.l %a1, %a4 /* run %a1 up to end of line */ | 235 | cmp.l %a1, %a4 /* run %a1 up to end of line */ |
164 | bhi.w .yuv_line_loop | 236 | bhi.w .yuv_line_loop |
165 | 237 | ||
166 | tst.l (44+4, %sp) /* use original Y pointer as a flag to */ | ||
167 | beq.b .yuv_exit /* distinguish between first and second */ | ||
168 | clr.l (44+4, %sp) /* pixel line */ | ||
169 | |||
170 | /* Rewind chroma pointers */ | ||
171 | movem.l (44+8, %sp), %a2-%a4 /* Cb data, Cr data, width */ | ||
172 | lea.l (%a1, %a4), %a4 /* end address */ | ||
173 | bra.w .yuv_line_loop | ||
174 | |||
175 | .yuv_exit: | ||
176 | move.w %d4, (%a0) /* write (very) last pixel */ | 238 | move.w %d4, (%a0) /* write (very) last pixel */ |
177 | 239 | ||
178 | movem.l (%sp), %d2-%d7/%a2-%a6 | 240 | movem.l (%sp), %d2-%d7/%a2-%a6 |
179 | lea.l (44, %sp), %sp /* restore registers */ | 241 | lea.l (44, %sp), %sp /* restore registers */ |
180 | |||
181 | rts | 242 | rts |
182 | .yuv_end: | 243 | .yuv_end: |
183 | .size lcd_write_yuv420_lines, .yuv_end - lcd_write_yuv420_lines | 244 | .size lcd_write_yuv420_lines, .yuv_end - lcd_write_yuv420_lines |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 8f76d5255a..00662e16f9 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -80,6 +80,9 @@ static int xoffset = 0; /* needed for flip */ | |||
80 | #define LCD_CMD (*(volatile unsigned short *)0xf0000000) | 80 | #define LCD_CMD (*(volatile unsigned short *)0xf0000000) |
81 | #define LCD_DATA (*(volatile unsigned short *)0xf0000002) | 81 | #define LCD_DATA (*(volatile unsigned short *)0xf0000002) |
82 | 82 | ||
83 | #define R_ENTRY_MODE_HORZ 0x7030 | ||
84 | #define R_ENTRY_MODE_VERT 0x7038 | ||
85 | |||
83 | /* called very frequently - inline! */ | 86 | /* called very frequently - inline! */ |
84 | static inline void lcd_write_reg(int reg, int val) | 87 | static inline void lcd_write_reg(int reg, int val) |
85 | { | 88 | { |
@@ -307,13 +310,12 @@ void lcd_blit(const fb_data* data, int x, int by, int width, | |||
307 | } | 310 | } |
308 | 311 | ||
309 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. | 312 | /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. |
310 | * y should have two lines of Y back to back. | 313 | * y should have two lines of Y back to back, 2nd line first. |
311 | * bu and rv should contain the Cb and Cr data for the two lines of Y. | 314 | * c should contain the Cb and Cr data for the two lines of Y back to back. |
312 | * Needs EMAC set to saturated, signed integer mode. | 315 | * Needs EMAC set to saturated, signed integer mode. |
313 | */ | 316 | */ |
314 | extern void lcd_write_yuv420_lines(const unsigned char *y, | 317 | extern void lcd_write_yuv420_lines(const unsigned char *y, |
315 | const unsigned char *bu, | 318 | const unsigned char *c, int cwidth); |
316 | const unsigned char *rv, int width); | ||
317 | 319 | ||
318 | /* Performance function to blit a YUV bitmap directly to the LCD | 320 | /* Performance function to blit a YUV bitmap directly to the LCD |
319 | * src_x, src_y, width and height should be even | 321 | * src_x, src_y, width and height should be even |
@@ -325,8 +327,7 @@ void lcd_yuv_blit(unsigned char * const src[3], | |||
325 | { | 327 | { |
326 | /* IRAM Y, Cb and Cb buffers. */ | 328 | /* IRAM Y, Cb and Cb buffers. */ |
327 | unsigned char y_ibuf[LCD_WIDTH*2]; | 329 | unsigned char y_ibuf[LCD_WIDTH*2]; |
328 | unsigned char bu_ibuf[LCD_WIDTH/2]; | 330 | unsigned char c_ibuf[LCD_WIDTH]; |
329 | unsigned char rv_ibuf[LCD_WIDTH/2]; | ||
330 | const unsigned char *ysrc, *usrc, *vsrc; | 331 | const unsigned char *ysrc, *usrc, *vsrc; |
331 | const unsigned char *ysrc_max; | 332 | const unsigned char *ysrc_max; |
332 | 333 | ||
@@ -336,11 +337,9 @@ void lcd_yuv_blit(unsigned char * const src[3], | |||
336 | width &= ~1; /* stay on the safe side */ | 337 | width &= ~1; /* stay on the safe side */ |
337 | height &= ~1; | 338 | height &= ~1; |
338 | 339 | ||
340 | lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); | ||
339 | /* Set start position and window */ | 341 | /* Set start position and window */ |
340 | lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+xoffset+width-1) << 8) | (x+xoffset)); | 342 | lcd_write_reg(R_VERT_RAM_ADDR_POS, ((xoffset + 219) << 8) | xoffset); |
341 | lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y); | ||
342 | |||
343 | lcd_begin_write_gram(); | ||
344 | 343 | ||
345 | ysrc = src[0] + src_y * stride + src_x; | 344 | ysrc = src[0] + src_y * stride + src_x; |
346 | usrc = src[1] + (src_y * stride >> 2) + (src_x >> 1); | 345 | usrc = src[1] + (src_y * stride >> 2) + (src_x >> 1); |
@@ -350,11 +349,17 @@ void lcd_yuv_blit(unsigned char * const src[3], | |||
350 | coldfire_set_macsr(EMAC_SATURATE); | 349 | coldfire_set_macsr(EMAC_SATURATE); |
351 | do | 350 | do |
352 | { | 351 | { |
353 | memcpy(y_ibuf, ysrc, width); | 352 | lcd_write_reg(R_HORIZ_RAM_ADDR_POS, ((y + 1) << 8) | y); |
354 | memcpy(y_ibuf + width, ysrc + stride, width); | 353 | lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y); |
355 | memcpy(bu_ibuf, usrc, width >> 1); | 354 | lcd_begin_write_gram(); |
356 | memcpy(rv_ibuf, vsrc, width >> 1); | 355 | |
357 | lcd_write_yuv420_lines(y_ibuf, bu_ibuf, rv_ibuf, width); | 356 | memcpy(y_ibuf + width, ysrc, width); |
357 | memcpy(y_ibuf, ysrc + stride, width); | ||
358 | memcpy(c_ibuf, usrc, width >> 1); | ||
359 | memcpy(c_ibuf + (width >> 1), vsrc, width >> 1); | ||
360 | lcd_write_yuv420_lines(y_ibuf, c_ibuf, width >> 1); | ||
361 | |||
362 | y += 2; | ||
358 | ysrc += 2 * stride; | 363 | ysrc += 2 * stride; |
359 | usrc += stride >> 1; | 364 | usrc += stride >> 1; |
360 | vsrc += stride >> 1; | 365 | vsrc += stride >> 1; |
@@ -368,11 +373,12 @@ void lcd_update(void) ICODE_ATTR; | |||
368 | void lcd_update(void) | 373 | void lcd_update(void) |
369 | { | 374 | { |
370 | if(display_on){ | 375 | if(display_on){ |
371 | /* reset update window */ | 376 | lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_VERT); |
377 | /* set start position window */ | ||
378 | lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 175 << 8); | ||
372 | lcd_write_reg(R_VERT_RAM_ADDR_POS,((xoffset+219)<<8) | xoffset); | 379 | lcd_write_reg(R_VERT_RAM_ADDR_POS,((xoffset+219)<<8) | xoffset); |
373 | |||
374 | /* Copy display bitmap to hardware */ | ||
375 | lcd_write_reg(R_RAM_ADDR_SET, xoffset << 8); | 380 | lcd_write_reg(R_RAM_ADDR_SET, xoffset << 8); |
381 | |||
376 | lcd_begin_write_gram(); | 382 | lcd_begin_write_gram(); |
377 | 383 | ||
378 | DAR3 = 0xf0000002; | 384 | DAR3 = 0xf0000002; |
@@ -403,8 +409,9 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
403 | if(y + height > LCD_HEIGHT) | 409 | if(y + height > LCD_HEIGHT) |
404 | height = LCD_HEIGHT - y; | 410 | height = LCD_HEIGHT - y; |
405 | 411 | ||
412 | lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_VERT); | ||
406 | /* set update window */ | 413 | /* set update window */ |
407 | 414 | lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 175 << 8); | |
408 | lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+xoffset+width-1) << 8) | (x+xoffset)); | 415 | lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+xoffset+width-1) << 8) | (x+xoffset)); |
409 | lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y); | 416 | lcd_write_reg(R_RAM_ADDR_SET, ((x+xoffset) << 8) | y); |
410 | lcd_begin_write_gram(); | 417 | lcd_begin_write_gram(); |