Set color depth to 8 if in pseudocolor in vesafb. The CLUT size, previously
saved as {red|green|blue}.length, is now private to vesafb.
Signed-off-by: Antonino Daplas <redacted>
---
vesafb.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff -Nru a/drivers/video/vesafb.c b/drivers/video/vesafb.c--- a/drivers/video/vesafb.c 2004-10-19 20:22:31 +08:00
+++ b/drivers/video/vesafb.c 2004-11-07 19:26:56 +08:00
@@ -56,6 +56,7 @@
static unsigned short *pmi_base = NULL;
static void (*pmi_start)(void);
static void (*pmi_pal)(void);
+static int depth;
/* --------------------------------------------------------------------- */
@@ -89,11 +90,11 @@
}
static void vesa_setpalette(int regno, unsigned red, unsigned green,
- unsigned blue, struct fb_var_screeninfo *var)
+ unsigned blue)
{
#ifdef __i386__
struct { u_char blue, green, red, pad; } entry;
- int shift = 16 - var->green.length;
+ int shift = 16 - depth;
if (pmi_setpal) {
entry.red = red >> shift;@@ -135,7 +136,7 @@
switch (info->var.bits_per_pixel) {
case 8:
- vesa_setpalette(regno,red,green,blue, &info->var);
+ vesa_setpalette(regno,red,green,blue);
break;
case 16:
if (info->var.red.offset == 10) {@@ -358,6 +359,15 @@
vesafb_defined.blue.length = screen_info.blue_size;
vesafb_defined.transp.offset = screen_info.rsvd_pos;
vesafb_defined.transp.length = screen_info.rsvd_size;
+
+ if (vesafb_defined.bits_per_pixel <= 8) {
+ depth = vesafb_defined.green.length;
+ vesafb_defined.red.length =
+ vesafb_defined.green.length =
+ vesafb_defined.blue.length =
+ vesafb_defined.bits_per_pixel;
+ }
+
printk(KERN_INFO "vesafb: %s: "
"size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
(vesafb_defined.bits_per_pixel > 8) ?
-------------------------------------------------------This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click