Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 13:16:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

offb: Fix setting of the pseudo-palette for >8bpp

Browse Source 
commit 1bb0b7d215 upstream.

When using a >8bpp framebuffer, offb advertises truecolor, not directcolor,
and doesn't touch the color map even if it has a corresponding access method
for the real hardware.

Thus it needs to set the pseudo-palette with all 3 components of the color,
like other truecolor framebuffers, not with copies of the color index like
a directcolor framebuffer would do.

This went unnoticed for a long time because it's pretty hard to get offb
to kick in with anything but 8bpp (old BootX under MacOS will do that and
qemu does it).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
This commit is contained in:
Benjamin Herrenschmidt 2011-12-28 00:10:16 +00:00 committed by Willy Tarreau
parent ea242bf2b2
commit c377a00dfc
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/video/offb.c
View File

@ -100,36 +100,32 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info) u_int transp, struct fb_info *info)
{ {
struct offb_par *par = (struct offb_par *) info->par; struct offb_par *par = (struct offb_par *) info->par;
int i, depth;
u32 *pal = info->pseudo_palette;
depth = info->var.bits_per_pixel; if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
if (depth == 16) u32 *pal = info->pseudo_palette;
depth = (info->var.green.length == 5) ? 15 : 16; u32 cr = red >> (16 - info->var.red.length);
u32 cg = green >> (16 - info->var.green.length);
u32 cb = blue >> (16 - info->var.blue.length);
u32 value;
if (regno > 255 || if (regno >= 16)
(depth == 16 && regno > 63) || return -EINVAL;
(depth == 15 && regno > 31))
return 1;
if (regno < 16) { value = (cr << info->var.red.offset) |
switch (depth) { (cg << info->var.green.offset) |
case 15: (cb << info->var.blue.offset);
pal[regno] = (regno << 10) | (regno << 5) | regno; if (info->var.transp.length > 0) {
break; u32 mask = (1 << info->var.transp.length) - 1;
case 16: mask <<= info->var.transp.offset;
pal[regno] = (regno << 11) | (regno << 5) | regno; value |= mask;
break;
case 24:
pal[regno] = (regno << 16) | (regno << 8) | regno;
break;
case 32:
i = (regno << 8) | regno;
pal[regno] = (i << 16) | i;
break;
} }
pal[regno] = value;
return 0;
} }
if (regno > 255)
return -EINVAL;
red >>= 8; red >>= 8;
green >>= 8; green >>= 8;
blue >>= 8; blue >>= 8;