mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
Fix the graphic corruption issue on IA64 machines
VGA console driver can misunderstand the current mode(Text/Graphic) under "disable console blanking" setting. When "disable console blank" is set (blankinterval=0), "do_unblank_screen()" function returns without changing "blank_state", and when "blank_state" is "blank_off", "do_blank_screen() function returns without invoking sw->con_blank() function. That's why VGA console driver can misunderstand the current mode. Signed-off-by: Nobuhiro Tachino <ntachino@redhat.com> Signed-off-by: Taku Izumi <izumi2005@soft.fujitsu.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: "Luck, Tony" <tony.luck@intel.com> Acked-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1a3f28817e
commit
b6e8f00fcd
@ -3506,9 +3506,6 @@ void do_blank_screen(int entering_gfx)
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (blank_state != blank_normal_wait)
|
|
||||||
return;
|
|
||||||
blank_state = blank_off;
|
|
||||||
|
|
||||||
/* entering graphics mode? */
|
/* entering graphics mode? */
|
||||||
if (entering_gfx) {
|
if (entering_gfx) {
|
||||||
@ -3516,10 +3513,15 @@ void do_blank_screen(int entering_gfx)
|
|||||||
save_screen(vc);
|
save_screen(vc);
|
||||||
vc->vc_sw->con_blank(vc, -1, 1);
|
vc->vc_sw->con_blank(vc, -1, 1);
|
||||||
console_blanked = fg_console + 1;
|
console_blanked = fg_console + 1;
|
||||||
|
blank_state = blank_off;
|
||||||
set_origin(vc);
|
set_origin(vc);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (blank_state != blank_normal_wait)
|
||||||
|
return;
|
||||||
|
blank_state = blank_off;
|
||||||
|
|
||||||
/* don't blank graphics */
|
/* don't blank graphics */
|
||||||
if (vc->vc_mode != KD_TEXT) {
|
if (vc->vc_mode != KD_TEXT) {
|
||||||
console_blanked = fg_console + 1;
|
console_blanked = fg_console + 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user