[PATCH] framebuffer GPM corruption fix.

This patch fixes the GPM cursor corruption people where seeing.

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 3826ea1a4e7e377be737d6fe084fc09d3510906a..11422933cf1506b7f9307f299791ba122cab4961 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1826,9 +1826,11 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
        vc->vc_font.height = h;
        if (vc->vc_hi_font_mask && cnt == 256) {
                vc->vc_hi_font_mask = 0;
-               if (vc->vc_can_do_color)
+               if (vc->vc_can_do_color) {
                        vc->vc_complement_mask >>= 1;
-
+                       vc->vc_s_complement_mask >>= 1;
+               }
+                       
                /* ++Edmund: reorder the attribute bits */
                if (vc->vc_can_do_color) {
                        unsigned short *cp =
@@ -1847,9 +1849,11 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
                }
        } else if (!vc->vc_hi_font_mask && cnt == 512) {
                vc->vc_hi_font_mask = 0x100;
-               if (vc->vc_can_do_color)
+               if (vc->vc_can_do_color) {
                        vc->vc_complement_mask <<= 1;
-
+                       vc->vc_s_complement_mask <<= 1;
+               }
+                       
                /* ++Edmund: reorder the attribute bits */
                {
                        unsigned short *cp =