Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (2c8be04ea415cbbc078fd010c57de61ea505ce85)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (2c8be04ea415cbbc078fd010c57de61ea505ce85)
  • Date: Sun, 27 Dec 2009 12:20:08 -0600

GIT changes to master grimoire by George Sherwood <george AT beernabeer.com>:

xorg-driver/xf86-video-vmware/HISTORY | 5 +
xorg-driver/xf86-video-vmware/PRE_BUILD | 7 ++
xorg-driver/xf86-video-vmware/vmware.patch | 78
+++++++++++++++++++++++++++++
3 files changed, 90 insertions(+)

New commits:
commit 2c8be04ea415cbbc078fd010c57de61ea505ce85
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

xf86-video-vmware: Added upstream patch to fix lockups
with xorg.

diff --git a/xorg-driver/xf86-video-vmware/HISTORY
b/xorg-driver/xf86-video-vmware/HISTORY
index da8653c..3ed6294 100644
--- a/xorg-driver/xf86-video-vmware/HISTORY
+++ b/xorg-driver/xf86-video-vmware/HISTORY
@@ -1,3 +1,8 @@
+2009-12-27 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply patch
+ * vmware.patch: Added fix for lockups from upstream bug:
+ https://bugs.freedesktop.org/show_bug.cgi?id=24541
+
2009-09-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 10.16.8
SOURCE matches upstream posted MD5
diff --git a/xorg-driver/xf86-video-vmware/PRE_BUILD
b/xorg-driver/xf86-video-vmware/PRE_BUILD
new file mode 100755
index 0000000..fa9a880
--- /dev/null
+++ b/xorg-driver/xf86-video-vmware/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# Upstream fix from
+# https://bugs.freedesktop.org/show_bug.cgi?id=24541
+
+patch -p0 < $SCRIPT_DIRECTORY/vmware.patch
diff --git a/xorg-driver/xf86-video-vmware/vmware.patch
b/xorg-driver/xf86-video-vmware/vmware.patch
new file mode 100644
index 0000000..a2a22ef
--- /dev/null
+++ b/xorg-driver/xf86-video-vmware/vmware.patch
@@ -0,0 +1,78 @@
+diff --git a/src/vmware.c b/src/vmware.c
+index 6004677..b5a5099 100644
+--- src/vmware.c
++++ src/vmware.c
+@@ -146,38 +146,6 @@ static PciChipsets VMWAREPciChipsets[] = {
+ { -1, -1, RES_UNDEFINED }
+ };
+
+-static const char *vgahwSymbols[] = {
+- "vgaHWGetHWRec",
+- "vgaHWGetIOBase",
+- "vgaHWGetIndex",
+- "vgaHWInit",
+- "vgaHWProtect",
+- "vgaHWRestore",
+- "vgaHWSave",
+- "vgaHWSaveScreen",
+- "vgaHWUnlock",
+- NULL
+-};
+-
+-static const char *fbSymbols[] = {
+- "fbCreateDefColormap",
+- "fbPictureInit",
+- "fbScreenInit",
+- NULL
+-};
+-
+-static const char *ramdacSymbols[] = {
+- "xf86CreateCursorInfoRec",
+- "xf86DestroyCursorInfoRec",
+- "xf86InitCursor",
+- NULL
+-};
+-
+-static const char *shadowfbSymbols[] = {
+- "ShadowFBInit2",
+- NULL
+-};
+-
+ #ifdef XFree86LOADER
+ static XF86ModuleVersionInfo vmwareVersRec = {
+ "vmware",
+@@ -640,8 +608,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
+ return FALSE;
+ }
+
+- xf86LoaderReqSymLists(vgahwSymbols, NULL);
+-
+ if (!vgaHWGetHWRec(pScrn)) {
+ return FALSE;
+ }
+@@ -959,7 +925,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
+ VMWAREFreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
+
+ /* Need ramdac for hwcursor */
+ if (pVMWARE->hwCursor) {
+@@ -967,7 +932,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
+ VMWAREFreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(ramdacSymbols, NULL);
+ }
+
+ return TRUE;
+@@ -2051,9 +2015,6 @@ vmwareSetup(pointer module, pointer opts, int *errmaj,
int *errmin)
+ setupDone = TRUE;
+ xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
+
+- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
+- shadowfbSymbols, NULL);
+-
+ return (pointer)1;
+ }
+ if (errmaj) {




Archive powered by MHonArc 2.6.24.

Top of Page