Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161642AbWAMDTQ (ORCPT ); Thu, 12 Jan 2006 22:19:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161648AbWAMDTQ (ORCPT ); Thu, 12 Jan 2006 22:19:16 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:25731 "EHLO sorel.sous-sol.org") by vger.kernel.org with ESMTP id S1161642AbWAMDTP (ORCPT ); Thu, 12 Jan 2006 22:19:15 -0500 Message-Id: <20060113032242.425265000@sorel.sous-sol.org> References: <20060113032102.154909000@sorel.sous-sol.org> Date: Thu, 12 Jan 2006 18:37:44 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@osdl.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , akpm@osdl.org, alan@lxorguk.ukuu.org.uk, samuel.thibault@ens-lyon.org, dravet@hotmail.com Subject: [PATCH 06/17] [PATCH] vgacon: fix doublescan mode Content-Disposition: inline; filename=vgacon-fix-doublescan-mode.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1357 Lines: 43 -stable review patch. If anyone has any objections, please let us know. ------------------ When doublescan mode is in use, scanlines must be doubled. Thanks to Jason Dravet for reporting and testing. Signed-off-by: Samuel Thibault Cc: Signed-off-by: Andrew Morton Signed-off-by: Chris Wright --- drivers/video/console/vgacon.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- linux-2.6.15.y.orig/drivers/video/console/vgacon.c +++ linux-2.6.15.y/drivers/video/console/vgacon.c @@ -503,10 +503,16 @@ static int vgacon_doresize(struct vc_dat { 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); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/