[PATCH] fbdev: Fix greater than 1 bit monochrome color handling

Currently, fbcon assumes that the visual FB_VISUAL_MONO* is always 1 bit.
According to Geert, there are old hardware where it's possible to have
monochrome at 8-bit, but has only 2 colors, black - 0x00 and white - 0xff.
Fix color handlers (fb_get_color_depth, and get_color) for this special case.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 3c731577fed628796423193ca9d99c7be4967671..12eaf0aa87e6f158a1127ac32127c837f342c96c 100644 (file)
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -39,7 +39,7 @@ static inline int get_attribute(struct fb_info *info, u16 c)
 {
        int attribute = 0;
 
-       if (fb_get_color_depth(&info->var) == 1) {
+       if (fb_get_color_depth(&info->var, &info->fix) == 1) {
                if (attr_underline(c))
                        attribute |= FBCON_ATTRIBUTE_UNDERLINE;
                if (attr_reverse(c))

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 751890a5f5f35a5cf7ffe43eb078708fae49cf51..88bd8ef56fde3c8575e8df67a9ad7ef91053ab35 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -214,7 +214,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
 static inline int get_color(struct vc_data *vc, struct fb_info *info,
              u16 c, int is_fg)
 {
-       int depth = fb_get_color_depth(&info->var);
+       int depth = fb_get_color_depth(&info->var, &info->fix);
        int color = 0;
 
        if (console_blanked) {
@@ -230,9 +230,13 @@ static inline int get_color(struct vc_data *vc, struct fb_info *info,
        switch (depth) {
        case 1:
        {
+               int col = ~(0xfff << (max(info->var.green.length,
+                                         max(info->var.red.length,
+                                             info->var.blue.length)))) & 0xff;
+
                /* 0 or 1 */
-               int fg = (info->fix.visual != FB_VISUAL_MONO01) ? 1 : 0;
-               int bg = (info->fix.visual != FB_VISUAL_MONO01) ? 0 : 1;
+               int fg = (info->fix.visual != FB_VISUAL_MONO01) ? col : 0;
+               int bg = (info->fix.visual != FB_VISUAL_MONO01) ? 0 : col;
 
                if (console_blanked)
                        fg = bg;
@@ -246,7 +250,6 @@ static inline int get_color(struct vc_data *vc, struct fb_info *info,
                 * is grayscale.
                 */
                color /= 4;
-               break;
        case 3:
                /*
                 * Last 8 entries of default 16-color palette is a more intense
@@ -426,7 +429,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
         * remove underline attribute from erase character
         * if black and white framebuffer.
         */
-       if (fb_get_color_depth(&info->var) == 1)
+       if (fb_get_color_depth(&info->var, &info->fix) == 1)
                erase &= ~0x400;
        logo_height = fb_prepare_logo(info);
        logo_lines = (logo_height + vc->vc_font.height - 1) /
@@ -930,7 +933,7 @@ static void fbcon_init(struct vc_data *vc, int init)
        }
        if (p->userfont)
                charcnt = FNTCHARCNT(p->fontdata);
-       vc->vc_can_do_color = (fb_get_color_depth(&info->var) != 1);
+       vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
        vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
        if (charcnt == 256) {
                vc->vc_hi_font_mask = 0;
@@ -1178,7 +1181,12 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
        if (p->userfont)
                charcnt = FNTCHARCNT(p->fontdata);
 
-       vc->vc_can_do_color = (fb_get_color_depth(var) != 1);
+       var->activate = FB_ACTIVATE_NOW;
+       info->var.activate = var->activate;
+       info->var.yoffset = info->var.xoffset = 0;
+       fb_set_var(info, var);
+
+       vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
        vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
        if (charcnt == 256) {
                vc->vc_hi_font_mask = 0;
@@ -1967,7 +1975,7 @@ static int fbcon_switch(struct vc_data *vc)
        set_blitting_type(vc, info, p);
        ((struct fbcon_ops *)info->fbcon_par)->cursor_reset = 1;
 
-       vc->vc_can_do_color = (fb_get_color_depth(&info->var) != 1);
+       vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
        vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
        updatescrollmode(p, info, vc);
 
@@ -2332,7 +2340,7 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
        if (!CON_IS_VISIBLE(vc))
                return 0;
 
-       depth = fb_get_color_depth(&info->var);
+       depth = fb_get_color_depth(&info->var, &info->fix);
        if (depth > 3) {
                for (i = j = 0; i < 16; i++) {
                        k = table[i];

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index a8eee79e117d2e610d518d40d7f5e1d7a0b23bf9..a815f5e2fcb5b1bf55745e26f1c53b9e83453795 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -62,16 +62,26 @@ int num_registered_fb;
  * Helpers
  */
 
-int fb_get_color_depth(struct fb_var_screeninfo *var)
+int fb_get_color_depth(struct fb_var_screeninfo *var,
+                      struct fb_fix_screeninfo *fix)
 {
-       if (var->green.length == var->blue.length &&
-           var->green.length == var->red.length &&
-           !var->green.offset && !var->blue.offset &&
-           !var->red.offset)
-               return var->green.length;
-       else
-               return (var->green.length + var->red.length +
-                       var->blue.length);
+       int depth = 0;
+
+       if (fix->visual == FB_VISUAL_MONO01 ||
+           fix->visual == FB_VISUAL_MONO10)
+               depth = 1;
+       else {
+               if (var->green.length == var->blue.length &&
+                   var->green.length == var->red.length &&
+                   var->green.offset == var->blue.offset &&
+                   var->green.offset == var->red.offset)
+                       depth = var->green.length;
+               else
+                       depth = var->green.length + var->red.length +
+                               var->blue.length;
+       }
+
+       return depth;
 }
 EXPORT_SYMBOL(fb_get_color_depth);
 
@@ -249,13 +259,18 @@ static void fb_set_logo(struct fb_info *info,
                               const struct linux_logo *logo, u8 *dst,
                               int depth)
 {
-       int i, j, k, fg = 1;
+       int i, j, k;
        const u8 *src = logo->data;
-       u8 d, xor = (info->fix.visual == FB_VISUAL_MONO01) ? 0xff : 0;
+       u8 xor = (info->fix.visual == FB_VISUAL_MONO01) ? 0xff : 0;
+       u8 fg = 1, d;
 
-       if (fb_get_color_depth(&info->var) == 3)
+       if (fb_get_color_depth(&info->var, &info->fix) == 3)
                fg = 7;
 
+       if (info->fix.visual == FB_VISUAL_MONO01 ||
+           info->fix.visual == FB_VISUAL_MONO10)
+               fg = ~((u8) (0xfff << info->var.green.length));
+
        switch (depth) {
        case 4:
                for (i = 0; i < logo->height; i++)
@@ -318,7 +333,7 @@ static struct logo_data {
 
 int fb_prepare_logo(struct fb_info *info)
 {
-       int depth = fb_get_color_depth(&info->var);
+       int depth = fb_get_color_depth(&info->var, &info->fix);
 
        memset(&fb_logo, 0, sizeof(struct logo_data));
 

diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index af99ea96012ec72ef57fd36655a6d8aaa22e809e..32952204ce331a4b6058cbce6f04f1417b999382 100644 (file)
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -658,7 +658,7 @@ static int nvidia_calc_regs(struct fb_info *info)
 {
        struct nvidia_par *par = info->par;
        struct _riva_hw_state *state = &par->ModeReg;
-       int i, depth = fb_get_color_depth(&info->var);
+       int i, depth = fb_get_color_depth(&info->var, &info->fix);
        int h_display = info->var.xres / 8 - 1;
        int h_start = (info->var.xres + info->var.right_margin) / 8 - 1;
        int h_end = (info->var.xres + info->var.right_margin +
@@ -978,6 +978,9 @@ static int nvidiafb_set_par(struct fb_info *info)
            !par->twoHeads)
                par->FPDither = 0;
 
+       info->fix.visual = (info->var.bits_per_pixel == 8) ?
+           FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+
        nvidia_init_vga(info);
        nvidia_calc_regs(info);
        nvidia_write_regs(par);
@@ -992,9 +995,6 @@ static int nvidiafb_set_par(struct fb_info *info)
        NVWriteCrtc(par, 0x11, 0x00);
        info->fix.line_length = (info->var.xres_virtual *
                                 info->var.bits_per_pixel) >> 3;
-       info->fix.visual = (info->var.bits_per_pixel == 8) ?
-           FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
-
        if (info->var.accel_flags) {
                info->fbops->fb_imageblit = nvidiafb_imageblit;
                info->fbops->fb_fillrect = nvidiafb_fillrect;

diff --git a/include/linux/fb.h b/include/linux/fb.h
index e3e16f43b1bb0564dce0f23476479eeb5d0455b1..c71a7162e0983ba1513339f2dfc04628faab884f 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -823,7 +823,8 @@ extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,
                                u32 height, u32 shift_high, u32 shift_low, u32 mod);
 extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height);
 extern void fb_set_suspend(struct fb_info *info, int state);
-extern int fb_get_color_depth(struct fb_var_screeninfo *var);
+extern int fb_get_color_depth(struct fb_var_screeninfo *var,
+                             struct fb_fix_screeninfo *fix);
 extern int fb_get_options(char *name, char **option);
 extern int fb_new_modelist(struct fb_info *info);