summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver/xserver-xf86-lite/libdri-xinerama-symbol.patch
blob: db29da93ca2212cf9e0ba8270044ab4314b8b0fc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Index: xorg-server-1.5.0/hw/xfree86/dri/dri.c
===================================================================
--- xorg-server-1.5.0.orig/hw/xfree86/dri/dri.c	2008-09-24 17:43:04.000000000 +0100
+++ xorg-server-1.5.0/hw/xfree86/dri/dri.c	2008-09-24 17:46:38.000000000 +0100
@@ -73,10 +73,6 @@
 
 #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
 
-#if !defined(PANORAMIX)
-extern Bool noPanoramiXExtension;
-#endif
-
 static int DRIEntPrivIndex = -1;
 static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
 static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
@@ -307,7 +303,6 @@
     drm_context_t *       reserved;
     int                 reserved_count;
     int                 i;
-    Bool                xineramaInCore = FALSE;
     DRIEntPrivPtr       pDRIEntPriv;
     ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
     DRIContextFlags	flags    = 0;
@@ -320,20 +315,13 @@
 	return FALSE;
     }
 
-    /*
-     * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
-     * anyway.
-     */
-    if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
-	xineramaInCore = TRUE;
-
-    if (xineramaInCore) {
-	if (!noPanoramiXExtension) {
-	    DRIDrvMsg(pScreen->myNum, X_WARNING,
-		"Direct rendering is not supported when Xinerama is enabled\n");
-	    return FALSE;
-	}
+#if defined(PANORAMIX)
+    if (!noPanoramiXExtension) {
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+            "Direct rendering is not supported when Xinerama is enabled\n");
+        return FALSE;
     }
+#endif
 
     if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
 			  pDRIInfo->busIdString,