svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

2 files changed, 32 insertions, 13 deletions

diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index 71a94c0c8..ae6a4615c 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -1211,6 +1211,8 @@ extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
 extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);

 extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);

 extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);

+extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);

+extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);

 

 /* Some macros to hide the system dependencies for MMIO accesses */

 /* Changed to kill noise generated by gcc's -Wcast-align */

@@ -1342,4 +1344,18 @@ extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
 #  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)

 

 # endif /* __alpha__ */

+

+/*

+ * With Intel, the version in os-support/misc/SlowBcopy.s is used.

+ * This avoids port I/O during the copy (which causes problems with

+ * some hardware).

+ */

+# ifdef __alpha__

+#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)

+#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)

+# else /* __alpha__ */

+#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)

+#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)

+# endif /* __alpha__ */

+

 #endif /* _COMPILER_H */

diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 42b7c5805..804fd37c1 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -120,8 +120,22 @@ DGAInit(
 
     DGAScreenKey = &DGAScreenKeyIndex;
 
-    if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
-	return FALSE;
+    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+    if (!pScreenPriv)
+    {
+	if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
+	    return FALSE;
+	dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
+	pScreenPriv->CloseScreen = pScreen->CloseScreen;
+	pScreen->CloseScreen = DGACloseScreen;
+	pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
+	pScreen->DestroyColormap = DGADestroyColormap;
+	pScreenPriv->InstallColormap = pScreen->InstallColormap;
+	pScreen->InstallColormap = DGAInstallColormap;
+	pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
+	pScreen->UninstallColormap = DGAUninstallColormap;
+    }
 
     pScreenPriv->pScrn = pScrn;
     pScreenPriv->numModes = num;
@@ -146,17 +160,6 @@ DGAInit(
 	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
 #endif
 
-    dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
-    pScreenPriv->CloseScreen = pScreen->CloseScreen;
-    pScreen->CloseScreen = DGACloseScreen;
-    pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
-    pScreen->DestroyColormap = DGADestroyColormap;
-    pScreenPriv->InstallColormap = pScreen->InstallColormap;
-    pScreen->InstallColormap = DGAInstallColormap;
-    pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
-    pScreen->UninstallColormap = DGAUninstallColormap;
-
-
     return TRUE;
 }