Commit 16822a6a authored by Kevin Brace's avatar Kevin Brace

Move the location R128PreInitDRI is called

Merge it into R128LegacyMS function.
Signed-off-by: Kevin Brace's avatarKevin Brace <>
parent c4c878d2
......@@ -1242,6 +1242,10 @@ static Bool R128LegacyMS(ScrnInfoPtr pScrn)
if (!R128PreInitControllers(pScrn, pInt10)) goto freeInt10;
#ifdef R128DRI
if (!R128PreInitDRI(pScrn)) goto freeInt10;
ret = TRUE;
/* 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;
info->CurrentLayout.displayWidth = pScrn->displayWidth;
if (!xf86RandR12PreInit(pScrn)) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment