linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / vesafb.c

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index b0b9acf..8982e54 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -57,7 +57,7 @@ static unsigned short  *pmi_base  = NULL;
 static void            (*pmi_start)(void);
 static void            (*pmi_pal)(void);
 static int             depth;
-static int             vga_compat;
+
 /* --------------------------------------------------------------------- */
 
 static int vesafb_pan_display(struct fb_var_screeninfo *var,
@@ -83,10 +83,9 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var,
 static void vesa_setpalette(int regno, unsigned red, unsigned green,
                            unsigned blue)
 {
-       int shift = 16 - depth;
-
 #ifdef __i386__
        struct { u_char blue, green, red, pad; } entry;
+       int shift = 16 - depth;
 
        if (pmi_setpal) {
                entry.red   = red   >> shift;
@@ -102,20 +101,14 @@ static void vesa_setpalette(int regno, unsigned red, unsigned green,
                   "d" (regno),          /* EDX */
                   "D" (&entry),         /* EDI */
                   "S" (&pmi_pal));      /* ESI */
-               return;
-       }
-#endif
-
-/*
- * without protected mode interface and if VGA compatible,
- * try VGA registers...
- */
-       if (vga_compat) {
+       } else {
+               /* without protected mode interface, try VGA registers... */
                outb_p(regno,       dac_reg);
                outb_p(red   >> shift, dac_val);
                outb_p(green >> shift, dac_val);
                outb_p(blue  >> shift, dac_val);
        }
+#endif
 }
 
 static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
@@ -221,7 +214,6 @@ static int __init vesafb_probe(struct platform_device *dev)
        if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
                return -ENODEV;
 
-       vga_compat = (screen_info.capabilities & 2) ? 0 : 1;
        vesafb_fix.smem_start = screen_info.lfb_base;
        vesafb_defined.bits_per_pixel = screen_info.lfb_depth;
        if (15 == vesafb_defined.bits_per_pixel)
@@ -326,12 +318,6 @@ static int __init vesafb_probe(struct platform_device *dev)
                }
        }
 
-       if (vesafb_defined.bits_per_pixel == 8 && !pmi_setpal && !vga_compat) {
-               printk(KERN_WARNING "vesafb: hardware palette is unchangeable,\n"
-                                   "        colors may be incorrect\n");
-               vesafb_fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
-       }
-
        vesafb_defined.xres_virtual = vesafb_defined.xres;
        vesafb_defined.yres_virtual = vesafb_fix.smem_len / vesafb_fix.line_length;
        if (ypan && vesafb_defined.yres_virtual > vesafb_defined.yres) {
@@ -368,8 +354,7 @@ static int __init vesafb_probe(struct platform_device *dev)
        printk(KERN_INFO "vesafb: %s: "
               "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
               (vesafb_defined.bits_per_pixel > 8) ?
-              "Truecolor" : (vga_compat || pmi_setpal) ?
-              "Pseudocolor" : "Static Pseudocolor",
+              "Truecolor" : "Pseudocolor",
               screen_info.rsvd_size,
               screen_info.red_size,
               screen_info.green_size,