From 7af07ab028defb0e28713732582d3971e2903b30 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 12 Mar 2012 10:55:32 -0400
Subject: [PATCH] vmware-11.0.3-vgahw.patch: Fix crash at start. (#801546)

---
 vmware-11.0.3-vgahw.patch | 11 +++++++++++
 xorg-x11-drv-vmware.spec  |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 vmware-11.0.3-vgahw.patch

diff --git a/vmware-11.0.3-vgahw.patch b/vmware-11.0.3-vgahw.patch
new file mode 100644
index 0000000..9ecd556
--- /dev/null
+++ b/vmware-11.0.3-vgahw.patch
@@ -0,0 +1,11 @@
+diff -up xf86-video-vmware-11.0.3/src/vmware.c.jx xf86-video-vmware-11.0.3/src/vmware.c
+--- xf86-video-vmware-11.0.3/src/vmware.c.jx	2012-03-12 10:45:59.000000000 -0400
++++ xf86-video-vmware-11.0.3/src/vmware.c	2012-03-12 10:50:01.600735012 -0400
+@@ -1142,6 +1142,7 @@ VMWAREModeInit(ScrnInfoPtr pScrn, Displa
+     vgaHWUnlock(hwp);
+     if (!vgaHWInit(pScrn, mode))
+         return FALSE;
++    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
+     pScrn->vtSema = TRUE;
+ 
+     vmwareReg->svga_reg_enable = 1;
diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec
index 0e06d50..958afd8 100644
--- a/xorg-x11-drv-vmware.spec
+++ b/xorg-x11-drv-vmware.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
 Version:    11.0.3
-Release:    13%{?dist}
+Release:    14%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -14,6 +14,7 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 Patch0:	    vmware-11.0.3-abi12.patch
 Patch1:	    vmware-11.0.3-unbreak-xinerama.patch
+Patch2:	    vmware-11.0.3-vgahw.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -33,6 +34,7 @@ X.Org X11 vmware video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .abi12
 %patch1 -p1 -b .xin
+%patch2 -p1 -b .vgahw
 
 %build
 %if 0%{?gitdate}
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Mon Mar 12 2012 Adam Jackson <ajax@redhat.com> 11.0.3-14
+- vmware-11.0.3-vgahw.patch: Fix crash at start. (#801546)
+
 * Sat Feb 11 2012 Peter Hutterer <peter.hutterer@redhat.com> - 11.0.3-13
 - ABI rebuild