minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

video: fix bug in cfb_console code

Browse Source 
FILL_15BIT_555RGB macro extension for pixel swapping
by commit bed53753dd1d7e6bcbea4339be0fb7760214cc35
introduced a bug in cfb_console:

Bitmaps with odd-numbered width won't be rendered
correctly and even U-Boot crashes are observed on
some platforms while repeated rendering of such
bitmaps with "bmp display". Also if a bitmap is
rendered to an odd-numbered x starting position,
the same problem occurs. This patch is an attempt
to fix it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Anatolij Gustschin 2008-08-08 18:00:40 +02:00 committed by Wolfgang Denk
parent d9015f6a50
commit e84d568fa2
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/video/cfb_console.c
View File

@ -751,24 +751,10 @@ void video_puts (const char *s)
fb ++; \ fb ++; \
} }
#if !defined(VIDEO_FB_16BPP_PIXEL_SWAP)
#define FILL_15BIT_555RGB(r,g,b) { \ #define FILL_15BIT_555RGB(r,g,b) { \
*(unsigned short *)fb = SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3))); \ *(unsigned short *)fb = SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3))); \
fb += 2; \ fb += 2; \
} }
#else
static int tgl;
static unsigned short p0;
#define FILL_15BIT_555RGB(r,g,b) { \
if (!tgl++) { \
p0 = SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3))); \
} else { \
tgl=0; \
*(unsigned long *)(fb-2) = (SWAP16((unsigned short)(((r>>3)<<10) | ((g>>3)<<5) | (b>>3)))<<16) | p0; \
} \
fb += 2; \
}
#endif
#define FILL_16BIT_565RGB(r,g,b) { \ #define FILL_16BIT_565RGB(r,g,b) { \
*(unsigned short *)fb = SWAP16((unsigned short)((((r)>>3)<<11) | (((g)>>2)<<5) | ((b)>>3))); \ *(unsigned short *)fb = SWAP16((unsigned short)((((r)>>3)<<11) | (((g)>>2)<<5) | ((b)>>3))); \
@ -796,6 +782,20 @@ static unsigned short p0;
} }
#endif #endif
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
static void inline fill_555rgb_pswap(uchar *fb, int x,
u8 r, u8 g, u8 b)
{
ushort *dst = (ushort *)fb;
ushort color = (ushort)(((r >> 3) << 10) |
((g >> 3) << 5) |
(b >> 3));
if (x & 1)
*(--dst) = color;
else
*(++dst) = color;
}
#endif
/* /*
* Display the BMP file located at address bmp_image. * Display the BMP file located at address bmp_image.
@ -927,11 +927,20 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
break; break;
case GDF_15BIT_555RGB: case GDF_15BIT_555RGB:
while (ycount--) { while (ycount--) {
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
int xpos = x;
#endif
WATCHDOG_RESET (); WATCHDOG_RESET ();
xcount = width; xcount = width;
while (xcount--) { while (xcount--) {
cte = bmp->color_table[*bmap++]; cte = bmp->color_table[*bmap++];
#if !defined(VIDEO_FB_16BPP_PIXEL_SWAP)
FILL_15BIT_555RGB (cte.red, cte.green, cte.blue); FILL_15BIT_555RGB (cte.red, cte.green, cte.blue);
#else
fill_555rgb_pswap (fb, xpos++, cte.red,
cte.green, cte.blue);
fb += 2;
#endif
} }
bmap += padded_line; bmap += padded_line;
fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE; fb -= (VIDEO_VISIBLE_COLS + width) * VIDEO_PIXEL_SIZE;
@ -993,10 +1002,19 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
break; break;
case GDF_15BIT_555RGB: case GDF_15BIT_555RGB:
while (ycount--) { while (ycount--) {
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
int xpos = x;
#endif
WATCHDOG_RESET (); WATCHDOG_RESET ();
xcount = width; xcount = width;
while (xcount--) { while (xcount--) {
#if !defined(VIDEO_FB_16BPP_PIXEL_SWAP)
FILL_15BIT_555RGB (bmap[2], bmap[1], bmap[0]); FILL_15BIT_555RGB (bmap[2], bmap[1], bmap[0]);
#else
fill_555rgb_pswap (fb, xpos++, bmap[2],
bmap[1], bmap[0]);
fb += 2;
#endif
bmap += 3; bmap += 3;
} }
bmap += padded_line; bmap += padded_line;
@ -1103,6 +1121,9 @@ void logo_plot (void *screen, int width, int x, int y)
} }
while (ycount--) { while (ycount--) {
#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
int xpos = x;
#endif
xcount = VIDEO_LOGO_WIDTH; xcount = VIDEO_LOGO_WIDTH;
while (xcount--) { while (xcount--) {
r = logo_red[*source - VIDEO_LOGO_LUT_OFFSET]; r = logo_red[*source - VIDEO_LOGO_LUT_OFFSET];
@ -1121,15 +1142,7 @@ void logo_plot (void *screen, int width, int x, int y)
*(unsigned short *) dest = *(unsigned short *) dest =
SWAP16 ((unsigned short) (((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3))); SWAP16 ((unsigned short) (((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3)));
#else #else
{ fill_555rgb_pswap (dest, xpos++, r, g, b);
if (!tgl++) {
p0 = SWAP16 ((unsigned short) (((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3)));
} else {
*(unsigned long *)(dest-2) =
(SWAP16 ((unsigned short) (((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3)))<<16) | p0;
tgl=0;
}
}
#endif #endif
break; break;
case GDF_16BIT_565RGB: case GDF_16BIT_565RGB: