aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
committermarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
commit1d46380a9bb69897acdadf71b80cd759b0493fad (patch)
treed8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /xorg-server/hw/xfree86
parent18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff)
parent293fd0043af7e861c9c540bebc44630d0da0bf9b (diff)
downloadvcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 18 oct 2012
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Events.c1
-rw-r--r--xorg-server/hw/xfree86/common/xf86platformBus.c8
-rw-r--r--xorg-server/hw/xfree86/dri/dri.c7
3 files changed, 6 insertions, 10 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 9dabf103f..d8d4fad9c 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -180,6 +180,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
switch (action) {
case ACTION_TERMINATE:
if (!xf86Info.dontZap) {
+ xf86Msg(X_INFO, "Server zapped. Shutting down.\n");
#ifdef XFreeXDGA
DGAShutdown();
#endif
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c
index 599d84ac2..0525e39bc 100644
--- a/xorg-server/hw/xfree86/common/xf86platformBus.c
+++ b/xorg-server/hw/xfree86/common/xf86platformBus.c
@@ -377,14 +377,6 @@ xf86platformProbeDev(DriverPtr drvp)
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 (xf86Info.autoAddGPU && numDevs) {
for (j = 0; j < xf86_num_platform_devices; j++) {
diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index 398178e27..6292e87cc 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -320,6 +320,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DRIContextFlags flags = 0;
DRIContextPrivPtr pDRIContextPriv;
+ static Bool drm_server_inited;
/* If the DRI extension is disabled, do not initialize the DRI */
if (noXFree86DRIExtension) {
@@ -345,6 +346,10 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE;
}
#endif
+ if (drm_server_inited == FALSE) {
+ drmSetServerInfo(&DRIDRMServerInfo);
+ drm_server_inited = TRUE;
+ }
if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
pDRIInfo->busIdString, pDRIInfo->drmDriverName))
@@ -791,8 +796,6 @@ DRIExtensionInit(void)
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
- drmSetServerInfo(&DRIDRMServerInfo);
-
return TRUE;
}