summaryrefslogtreecommitdiff
path: root/arch/x86/boot/video.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-17 18:32:06 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-17 18:32:06 -0800
commitf1f6baf8f1df29be38003089787e378567ce0086 (patch)
tree241bbc2e266f5d08cec510064fc4a2cc0417c46e /arch/x86/boot/video.c
parentb0483e78e5c4c9871fc5541875b3bc006846d46b (diff)
x86, setup: When restoring the screen, update boot_params.screen_info
When we restore the screen content after a mode change, we return the cursor to its former position. However, we need to also update boot_params.screen_info accordingly, so that the decompression code knows where on the screen the cursor is. Just in case the video BIOS does something extra screwy, read the cursor position back from the BIOS instead of relying on it doing the right thing. While we're at it, make sure we cap the cursor position to the new screen coordinates. Reported-by: Wim Osterholt <wim@djo.tudelft.nl> Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329 Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/video.c')
-rw-r--r--arch/x86/boot/video.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index f767164cd5df..43eda284d27f 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -298,11 +298,18 @@ static void restore_screen(void)
}
/* Restore cursor position */
+ if (saved.curx >= xs)
+ saved.curx = xs-1;
+ if (saved.cury >= ys)
+ saved.cury = ys-1;
+
initregs(&ireg);
ireg.ah = 0x02; /* Set cursor position */
ireg.dh = saved.cury;
ireg.dl = saved.curx;
intcall(0x10, &ireg, NULL);
+
+ store_cursor_position();
}
void set_video(void)