From f189fe9f8c3bfd4e5b16a8888215737f5d454121 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 8 Jan 2006 01:02:34 -0800 Subject: [PATCH] --- yaml --- r: 16948 b: refs/heads/master c: 954de9141e75cf2f1ce69ccdbedc83ec827a01ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/console/vgacon.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c9e81566998..52dc75f20470 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8b0af24353eafadf58a0889999700e43f135aad +refs/heads/master: 954de9141e75cf2f1ce69ccdbedc83ec827a01ec diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index 167de397e4b4..f4e1c4b4191e 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -503,10 +503,16 @@ static int vgacon_doresize(struct vc_data *c, { unsigned long flags; unsigned int scanlines = height * c->vc_font.height; - u8 scanlines_lo, r7, vsync_end, mode; + u8 scanlines_lo, r7, vsync_end, mode, max_scan; spin_lock_irqsave(&vga_lock, flags); + outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg); + max_scan = inb_p(vga_video_port_val); + + if (max_scan & 0x80) + scanlines <<= 1; + outb_p(VGA_CRTC_MODE, vga_video_port_reg); mode = inb_p(vga_video_port_val);