frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'airlied/for-keithp'

This commit is contained in:
Keith Packard 2012-12-17 10:56:12 -08:00
parent da3eaf6bdb 6b4aa8a359
commit d982d87743
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86platformBus.c
View File

@ -377,14 +377,6 @@ xf86platformProbeDev(DriverPtr drvp)
continue; continue;
} }
/*
* If all of the above fails, which can happen if X was started without
* configuration or if BusID wasn't set for non-PCI devices, use the first
* device by default.
*/
if (!foundScreen && xf86_num_platform_devices > 0 && numDevs > 0)
foundScreen = probeSingleDevice(&xf86_platform_devices[0], drvp, devList[0], 0);
/* if autoaddgpu devices is enabled then go find a few more and add them as GPU screens */ /* if autoaddgpu devices is enabled then go find a few more and add them as GPU screens */
if (xf86Info.autoAddGPU && numDevs) { if (xf86Info.autoAddGPU && numDevs) {
for (j = 0; j < xf86_num_platform_devices; j++) { for (j = 0; j < xf86_num_platform_devices; j++) {

7
hw/xfree86/dri/dri.c
View File

@ -320,6 +320,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DRIContextFlags flags = 0; DRIContextFlags flags = 0;
DRIContextPrivPtr pDRIContextPriv; DRIContextPrivPtr pDRIContextPriv;
static Bool drm_server_inited;
/* If the DRI extension is disabled, do not initialize the DRI */ /* If the DRI extension is disabled, do not initialize the DRI */
if (noXFree86DRIExtension) { if (noXFree86DRIExtension) {
@ -345,6 +346,10 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE; return FALSE;
} }
#endif #endif
if (drm_server_inited == FALSE) {
drmSetServerInfo(&DRIDRMServerInfo);
drm_server_inited = TRUE;
}
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize, if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
pDRIInfo->busIdString, pDRIInfo->drmDriverName)) pDRIInfo->busIdString, pDRIInfo->drmDriverName))
@ -791,8 +796,6 @@ DRIExtensionInit(void)
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL); RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
drmSetServerInfo(&DRIDRMServerInfo);
return TRUE; return TRUE;
} }