svn commit: r195529 - in stable/7/sys: . contrib/pf i386/isa

[Xin LI]

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;