diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-18 10:03:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-18 10:03:13 +0100 |
| commit | 293fd0043af7e861c9c540bebc44630d0da0bf9b (patch) | |
| tree | a2579cb27e39607896c76419af5a1ba2f5964ec9 /xorg-server/hw/xfree86/dri | |
| parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
| download | vcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.tar.gz vcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.tar.bz2 vcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.zip | |
xserver mesa git update 18 oct 2012
xserver: 3420a7778c7d5eaa638327f31dd460554c257bb1
mesa: dc613f11ddf1f3a6e10c2d99830fb1a84fdb55b2
Diffstat (limited to 'xorg-server/hw/xfree86/dri')
| -rw-r--r-- | xorg-server/hw/xfree86/dri/dri.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |