From 16822a6a31731cb457ab35b79e5cd6f04c060625 Mon Sep 17 00:00:00 2001
From: Kevin Brace <kevinbrace@gmx.com>
Date: Tue, 26 Jun 2018 17:40:11 -0500
Subject: [PATCH] Move the location R128PreInitDRI is called

Merge it into R128LegacyMS function.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
---
 src/r128_driver.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 87395a7..c272a30 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -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)) {