45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
|
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
|
||
|
|
index b736c6a..3f14705 100644
|
||
|
|
--- a/hw/xfree86/dri/dri.c
|
||
|
|
+++ b/hw/xfree86/dri/dri.c
|
||
|
|
@@ -73,7 +73,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||
|
|
|
||
|
|
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
|
||
|
|
|
||
|
|
-#if !defined(PANORAMIX)
|
||
|
|
+#ifdef PANORAMIX
|
||
|
|
extern Bool noPanoramiXExtension;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -307,7 +307,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
|
||
|
|
drm_context_t * reserved;
|
||
|
|
int reserved_count;
|
||
|
|
int i;
|
||
|
|
- Bool xineramaInCore = FALSE;
|
||
|
|
DRIEntPrivPtr pDRIEntPriv;
|
||
|
|
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||
|
|
DRIContextFlags flags = 0;
|
||
|
|
@@ -320,20 +319,18 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifdef PANORAMIX
|
||
|
|
/*
|
||
|
|
* 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;
|
||
|
|
}
|
||
|
|
- }
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
|
||
|
|
pDRIInfo->busIdString,
|