[PATCH xf86-video-r128] Deprecate R128VerboseInitEXA

Kevin Brace kevinbrace at gmx.com
Tue Jul 31 05:43:16 UTC 2018


Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
---
 src/r128_driver.c | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 1642ea9..ed560b7 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1643,30 +1643,6 @@ R128BlockHandler(BLOCKHANDLER_ARGS_DECL)
     }
 }
 
-#ifdef USE_EXA
-Bool R128VerboseInitEXA(ScreenPtr pScreen)
-{
-    ScrnInfoPtr pScrn  = xf86ScreenToScrn(pScreen);
-    R128InfoPtr info   = R128PTR(pScrn);
-
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Going to init EXA...\n");
-
-    if (R128EXAInit(pScreen)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EXA Acceleration enabled\n");
-	info->accelOn = TRUE;
-
-	return TRUE;
-    } else {
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "EXA Acceleration initialization failed\n");
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EXA Acceleration disabled\n");
-	info->accelOn = FALSE;
-
-	return FALSE;
-    }
-}
-#endif
-
 /* Called at the start of each server generation. */
 Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 {
@@ -1923,7 +1899,20 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
              */
             info->ExaDriver->memorySize = total;
 
-            R128VerboseInitEXA(pScreen);
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Going to init EXA...\n");
+
+            if (R128EXAInit(pScreen)) {
+                info->accelOn = TRUE;
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                            "EXA Acceleration enabled.\n");
+            } else {
+                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                            "EXA Acceleration initialization "
+                            "failed.\n");
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                            "EXA Acceleration disabled.\n");
+            }
         }
     }
 #endif
-- 
2.7.4



More information about the xorg-driver-ati mailing list