From owner-svn-src-all@FreeBSD.ORG  Tue Jun  9 00:54:57 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 972B6106566C;
	Tue,  9 Jun 2009 00:54:57 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 84EB08FC0A;
	Tue,  9 Jun 2009 00:54:57 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n590svrx050372;
	Tue, 9 Jun 2009 00:54:57 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n590sv8L050370;
	Tue, 9 Jun 2009 00:54:57 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200906090054.n590sv8L050370@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 9 Jun 2009 00:54:57 +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: r193790 - head/sys/i386/isa
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: Tue, 09 Jun 2009 00:54:58 -0000

Author: delphij
Date: Tue Jun  9 00:54:57 2009
New Revision: 193790
URL: http://svn.freebsd.org/changeset/base/193790

Log:
  Add line width calculations for 15/16 and 24/32 bit modes in case
  the "Get Scan Line Length" function fails, as it does in Parallels
  (in Version 2.2, Build 2112 at least).
  
  PR:		i386/127367
  Obtained from:	DragonFly
  Submitted by:	Pedro Giffuni
  MFC after:	1 month

Modified:
  head/sys/i386/isa/vesa.c

Modified: head/sys/i386/isa/vesa.c
==============================================================================
--- head/sys/i386/isa/vesa.c	Tue Jun  9 00:47:54 2009	(r193789)
+++ head/sys/i386/isa/vesa.c	Tue Jun  9 00:54:57 2009	(r193790)
@@ -1111,6 +1111,14 @@ vesa_set_mode(video_adapter_t *adp, int 
 		default: /* shouldn't happen */
 			vesa_adp->va_line_width = info.vi_width;
 			break;
+		case 15:
+		case 16:
+			vesa_adp->va_line_width = info.vi_width*2;
+			break;
+		case 24:
+		case 32:
+			vesa_adp->va_line_width = info.vi_width*4;
+			break;
 		}
 	} else {
 		vesa_adp->va_line_width = info.vi_width;