Commit f1f6baf8 authored by H. Peter Anvin's avatar H. Peter Anvin

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: default avatarWim Osterholt <wim@djo.tudelft.nl>
Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent b0483e78
...@@ -298,11 +298,18 @@ static void restore_screen(void) ...@@ -298,11 +298,18 @@ static void restore_screen(void)
} }
/* Restore cursor position */ /* Restore cursor position */
if (saved.curx >= xs)
saved.curx = xs-1;
if (saved.cury >= ys)
saved.cury = ys-1;
initregs(&ireg); initregs(&ireg);
ireg.ah = 0x02; /* Set cursor position */ ireg.ah = 0x02; /* Set cursor position */
ireg.dh = saved.cury; ireg.dh = saved.cury;
ireg.dl = saved.curx; ireg.dl = saved.curx;
intcall(0x10, &ireg, NULL); intcall(0x10, &ireg, NULL);
store_cursor_position();
} }
void set_video(void) void set_video(void)
......
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