From owner-svn-src-stable@FreeBSD.ORG  Fri Jul 10 06:57:01 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28E02106567B;
	Fri, 10 Jul 2009 06:57:01 +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 16AAA8FC14;
	Fri, 10 Jul 2009 06:57:01 +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 n6A6v01m010065;
	Fri, 10 Jul 2009 06:57:00 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6A6v0lK010063;
	Fri, 10 Jul 2009 06:57:00 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200907100657.n6A6v0lK010063@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 10 Jul 2009 06:57:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195529 - in stable/7/sys: . contrib/pf i386/isa
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2009 06:57:02 -0000

Author: delphij
Date: Fri Jul 10 06:57:00 2009
New Revision: 195529
URL: http://svn.freebsd.org/changeset/base/195529

Log:
  MFC r193790:
  
  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

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/i386/isa/vesa.c

Modified: stable/7/sys/i386/isa/vesa.c
==============================================================================
--- stable/7/sys/i386/isa/vesa.c	Fri Jul 10 06:55:30 2009	(r195528)
+++ stable/7/sys/i386/isa/vesa.c	Fri Jul 10 06:57:00 2009	(r195529)
@@ -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;