From owner-svn-src-all@FreeBSD.ORG  Thu Sep 24 20:10:06 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B725106566B;
	Thu, 24 Sep 2009 20:10:06 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A2FC8FC29;
	Thu, 24 Sep 2009 20:10:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8OKA0D4006439;
	Thu, 24 Sep 2009 20:10:00 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8OKA0nl006437;
	Thu, 24 Sep 2009 20:10:00 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200909242010.n8OKA0nl006437@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 24 Sep 2009 20:10:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197468 - head/sys/dev/fb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2009 20:10:06 -0000

Author: jkim
Date: Thu Sep 24 20:10:00 2009
New Revision: 197468
URL: http://svn.freebsd.org/changeset/base/197468

Log:
  Some broken VESA BIOSes, e.g., IBM T23, return wrong value from
  vesa_bios_get_line_length() in graphics mode.  Always calculate the value
  from known video info instead.
  
  Submitted by:	paradox (ddkprog yahoo com)

Modified:
  head/sys/dev/fb/vesa.c

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Thu Sep 24 19:42:56 2009	(r197467)
+++ head/sys/dev/fb/vesa.c	Thu Sep 24 20:10:00 2009	(r197468)
@@ -1132,10 +1132,8 @@ vesa_set_mode(video_adapter_t *adp, int 
 		vesa_adp->va_window_gran = info.vi_window_gran;
 	}
 	vesa_adp->va_window_orig = 0;
-	len = vesa_bios_get_line_length();
-	if (len > 0) {
-		vesa_adp->va_line_width = len;
-	} else if (info.vi_flags & V_INFO_GRAPHICS) {
+
+	if (info.vi_flags & V_INFO_GRAPHICS) {
 		switch (info.vi_depth/info.vi_planes) {
 		case 1:
 			vesa_adp->va_line_width = info.vi_width/8;
@@ -1161,6 +1159,9 @@ vesa_set_mode(video_adapter_t *adp, int 
 		}
 	} else {
 		vesa_adp->va_line_width = info.vi_width;
+		len = vesa_bios_get_line_length();
+		if (len > 0)
+			vesa_adp->va_line_width = len;
 	}
 	vesa_adp->va_disp_start.x = 0;
 	vesa_adp->va_disp_start.y = 0;