Commit 863c0e92 authored by James Simmons's avatar James Simmons Committed by Linus Torvalds

[PATCH] framebuffer GPM corruption fix.

This patch fixes the GPM cursor corruption people where seeing.
parent 92155747
...@@ -1826,9 +1826,11 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op, ...@@ -1826,9 +1826,11 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
vc->vc_font.height = h; vc->vc_font.height = h;
if (vc->vc_hi_font_mask && cnt == 256) { if (vc->vc_hi_font_mask && cnt == 256) {
vc->vc_hi_font_mask = 0; 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_complement_mask >>= 1;
vc->vc_s_complement_mask >>= 1;
}
/* ++Edmund: reorder the attribute bits */ /* ++Edmund: reorder the attribute bits */
if (vc->vc_can_do_color) { if (vc->vc_can_do_color) {
unsigned short *cp = unsigned short *cp =
...@@ -1847,9 +1849,11 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op, ...@@ -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) { } else if (!vc->vc_hi_font_mask && cnt == 512) {
vc->vc_hi_font_mask = 0x100; 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_complement_mask <<= 1;
vc->vc_s_complement_mask <<= 1;
}
/* ++Edmund: reorder the attribute bits */ /* ++Edmund: reorder the attribute bits */
{ {
unsigned short *cp = unsigned short *cp =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment