diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2012-03-19 14:53:34 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2012-04-30 17:22:22 +0200 |
| commit | cf453c62e4c9182dd917866666c8da9111529923 (patch) | |
| tree | a5ae435e732688529b062c54163f3d0ae35c413d | |
| parent | a2382c70b0837afc4bfe3057b2403cc8ae5d3a06 (diff) | |
vmware/legacy: Fix crash on Xserver 1.12.0vmware-11.1-branch
(cherry picked from commit c6f27561c7cf7c30f89493d64e3c5694b5f53469)
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 f90e8b9..a020124 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.7.0], [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1, [Has version 1.7.0 or greater of the Xserver])]) +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 0f5a1b7..35da834 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -679,6 +679,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. |