[PATCH xf86-video-r128 1/2] Move the location R128PreInitDRI is called

Kevin Brace kevinbrace at gmx.com
Sun Jul 1 03:10:26 UTC 2018


Merge it into R128LegacyMS function.

Signed-off-by: Kevin Brace <kevinbrace at 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)) {
-- 
2.7.4



More information about the xorg-driver-ati mailing list