mirror of
https://github.com/X11Libre/xf86-video-r128.git
synced 2026-03-24 01:24:26 +00:00
Move the location R128PreInitDRI is called
Merge it into R128LegacyMS function. Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
This commit is contained in:
@@ -1242,6 +1242,10 @@ static Bool R128LegacyMS(ScrnInfoPtr pScrn)
|
||||
|
||||
if (!R128PreInitControllers(pScrn, pInt10)) goto freeInt10;
|
||||
|
||||
#ifdef R128DRI
|
||||
if (!R128PreInitDRI(pScrn)) goto freeInt10;
|
||||
#endif
|
||||
|
||||
ret = TRUE;
|
||||
freeInt10:
|
||||
/* Free int10 info */
|
||||
@@ -1402,10 +1406,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
|
||||
|
||||
if (!R128PreInitCursor(pScrn)) goto fail;
|
||||
|
||||
#ifdef R128DRI
|
||||
if (!R128PreInitDRI(pScrn)) goto fail;
|
||||
#endif
|
||||
|
||||
info->CurrentLayout.displayWidth = pScrn->displayWidth;
|
||||
|
||||
if (!xf86RandR12PreInit(pScrn)) {
|
||||
|
||||
Reference in New Issue
Block a user