lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] atyfb: Fix hardware cursor handling

Browse Source 
Fix image and color handling in atyfb_cursor()

- In the 2-bit scheme of the cursor image, just set the first bit to be
  always zero (turn off transparency and/or XOR), and just do the masking
  manually

- The cursor color is converted into 32-bit RGBA8888 using struct fb_cmap.
  Each component in the cmap is u16 in size, so mask the upper 8 bits.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas
2006-06-26 00:26:31 -07:00
committed by Linus Torvalds
parent 8eec498108
commit 72c24cc51a
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/video/aty/mach64_cursor.c
View File

@@ -66,11 +66,6 @@ static const u8 cursor_bits_lookup[16] = {
0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55 0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55
}; };
static const u8 cursor_mask_lookup[16] = {
0xaa, 0x2a, 0x8a, 0x0a, 0xa2, 0x22, 0x82, 0x02,
0xa8, 0x28, 0x88, 0x08, 0xa0, 0x20, 0x80, 0x00
};
static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor) static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
@@ -130,13 +125,13 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
fg_idx = cursor->image.fg_color; fg_idx = cursor->image.fg_color;
bg_idx = cursor->image.bg_color; bg_idx = cursor->image.bg_color;
fg = (info->cmap.red[fg_idx] << 24) | fg = ((info->cmap.red[fg_idx] & 0xff) << 24) |
(info->cmap.green[fg_idx] << 16) | ((info->cmap.green[fg_idx] & 0xff) << 16) |
(info->cmap.blue[fg_idx] << 8) | 15; ((info->cmap.blue[fg_idx] & 0xff) << 8) | 0xff;
bg = (info->cmap.red[bg_idx] << 24) | bg = ((info->cmap.red[bg_idx] & 0xff) << 24) |
(info->cmap.green[bg_idx] << 16) | ((info->cmap.green[bg_idx] & 0xff) << 16) |
(info->cmap.blue[bg_idx] << 8); ((info->cmap.blue[bg_idx] & 0xff) << 8);
wait_for_fifo(2, par); wait_for_fifo(2, par);
aty_st_le32(CUR_CLR0, bg, par); aty_st_le32(CUR_CLR0, bg, par);
@@ -166,19 +161,17 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
switch (cursor->rop) { switch (cursor->rop) {
case ROP_XOR: case ROP_XOR:
// Upper 4 bits of mask data // Upper 4 bits of mask data
fb_writeb(cursor_mask_lookup[m >> 4 ] | fb_writeb(cursor_bits_lookup[(b ^ m) >> 4], dst++);
cursor_bits_lookup[(b ^ m) >> 4], dst++);
// Lower 4 bits of mask // Lower 4 bits of mask
fb_writeb(cursor_mask_lookup[m & 0x0f ] | fb_writeb(cursor_bits_lookup[(b ^ m) & 0x0f],
cursor_bits_lookup[(b ^ m) & 0x0f], dst++); dst++);
break; break;
case ROP_COPY: case ROP_COPY:
// Upper 4 bits of mask data // Upper 4 bits of mask data
fb_writeb(cursor_mask_lookup[m >> 4 ] | fb_writeb(cursor_bits_lookup[(b & m) >> 4], dst++);
cursor_bits_lookup[(b & m) >> 4], dst++);
// Lower 4 bits of mask // Lower 4 bits of mask
fb_writeb(cursor_mask_lookup[m & 0x0f ] | fb_writeb(cursor_bits_lookup[(b & m) & 0x0f],
cursor_bits_lookup[(b & m) & 0x0f], dst++); dst++);
break; break;
} }
} }