diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2012-03-19 14:53:34 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2012-03-20 22:17:55 +0100 |
| commit | c6f27561c7cf7c30f89493d64e3c5694b5f53469 (patch) | |
| tree | 0a8aa6a46cbe8e6eca6e6eb0a2a781cdf7a07184 | |
| parent | b70116b907aa8545f0275589a52275235083bb40 (diff) | |
| download | xf86-video-vmware-c6f27561c7cf7c30f89493d64e3c5694b5f53469.tar.gz xf86-video-vmware-c6f27561c7cf7c30f89493d64e3c5694b5f53469.tar.bz2 xf86-video-vmware-c6f27561c7cf7c30f89493d64e3c5694b5f53469.zip | |
vmware/legacy: Fix crash on Xserver 1.12.0
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/vmware.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 77ec7d6..d12dd19 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.7.0], [Has version 1.7.0 or greater of the Xserver]) BUILD_VMWGFX=yes],[BUILD_VMWGFX=no]) +PKG_CHECK_EXISTS([xorg-server >= 1.12.0], + [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1, + [Has version 1.12.0 or greater of the Xserver])]) + # Obtain compiler/linker options for the vmwarectrl client tool PKG_CHECK_MODULES(X11, x11 xext) diff --git a/src/vmware.c b/src/vmware.c index f20ddb9..e3892f1 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -350,6 +350,10 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } +#ifdef HAVE_XORG_SERVER_1_12_0 + vgaHWSetStdFuncs(VGAHWPTR(pScrn)); +#endif + /* * Save the current video state. Do it here before VMXGetVMwareSvgaId * writes to any registers. |