leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt/fbcon: update scrl_erase_char after 256/512-glyph font switch

Browse Source 
Addendum to commit c9e587abfd ("vt: fix
background color on line feed").

vc->vc_scrl_erase_char was not updated when fbcon switches between
256- and 512-glyph fonts.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Engelhardt 2008-05-12 14:02:38 -07:00 committed by Linus Torvalds
parent 9fb1f68d40
commit 7fe3915a49
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/console/fbcon.c
View File

@ -2507,6 +2507,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
c = vc->vc_video_erase_char; c = vc->vc_video_erase_char;
vc->vc_video_erase_char = vc->vc_video_erase_char =
((c & 0xfe00) >> 1) | (c & 0xff); ((c & 0xfe00) >> 1) | (c & 0xff);
c = vc->vc_def_color;
vc->vc_scrl_erase_char =
((c & 0xFE00) >> 1) | (c & 0xFF);
vc->vc_attr >>= 1; vc->vc_attr >>= 1;
} }
} else if (!vc->vc_hi_font_mask && cnt == 512) { } else if (!vc->vc_hi_font_mask && cnt == 512) {
@ -2537,9 +2540,14 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
if (vc->vc_can_do_color) { if (vc->vc_can_do_color) {
vc->vc_video_erase_char = vc->vc_video_erase_char =
((c & 0xff00) << 1) | (c & 0xff); ((c & 0xff00) << 1) | (c & 0xff);
c = vc->vc_def_color;
vc->vc_scrl_erase_char =
((c & 0xFF00) << 1) | (c & 0xFF);
vc->vc_attr <<= 1; vc->vc_attr <<= 1;
} else } else {
vc->vc_video_erase_char = c & ~0x100; vc->vc_video_erase_char = c & ~0x100;
vc->vc_scrl_erase_char = c & ~0x100;
}
} }
} }