andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dri1: fix dri1 startup since 459c6da0f9 

This commit regresses dri1 since it moves the drmSetServerInfo from being
called at module load time to extension init time. However DRIScreenInit
relies on this being called before it gets control.

This patches moves the call into DRIScreenInit and seems to work here.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-09-26 16:16:40 +10:00
parent b51a1bd276
commit 785af88ab0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}