From 3e4b315e5f200ec003a21844414832c1d5a0bea3 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Tue, 17 Jul 2007 16:16:10 -0700
Subject: [PATCH] --- yaml --- r: 61391 b: refs/heads/master c:
 7ad37df02c529525c4ad19035359af89d2d2a5bd h: refs/heads/master i:   61389:
 3d62d40bd2cceb4b5b424197a66f3a5f294985a5   61387:
 73034b626eac0bfddae2faa3c02a2d6e7c03073b   61383:
 6ae42aead793cb86f2cd3cb976571f3416937b5f   61375:
 72a094e1dca8646a16868c740a66121de950f8bf v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/boot/video.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f4a784b941f..f688ff6b2aba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5593eaa854d0b23c3b270933a93b9b82946df729
+refs/heads/master: 7ad37df02c529525c4ad19035359af89d2d2a5bd
diff --git a/trunk/arch/i386/boot/video.c b/trunk/arch/i386/boot/video.c
index 027a2c90300b..958130ef0042 100644
--- a/trunk/arch/i386/boot/video.c
+++ b/trunk/arch/i386/boot/video.c
@@ -195,7 +195,7 @@ static void vga_recalc_vertical(void)
 {
 	unsigned int font_size, rows;
 	u16 crtc;
-	u8 ov;
+	u8 pt, ov;
 
 	set_fs(0);
 	font_size = rdfs8(0x485); /* BIOS: font size (pixels) */
@@ -206,7 +206,12 @@ static void vga_recalc_vertical(void)
 
 	crtc = vga_crtc();
 
+	pt = in_idx(crtc, 0x11);
+	pt &= ~0x80;		/* Unlock CR0-7 */
+	out_idx(pt, crtc, 0x11);
+
 	out_idx((u8)rows, crtc, 0x12); /* Lower height register */
+
 	ov = in_idx(crtc, 0x07); /* Overflow register */
 	ov &= 0xbd;
 	ov |= (rows >> (8-1)) & 0x02;