summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--src/vmware.c4
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.