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>

diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index f767164cd5df91e1aaf2088fca44a3a26213f69c..43eda284d27fe96c2a4d407273f4b8d61bae87e2 100644 (file)
--- 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)