From 78b21efdce6f1231b0c9c8a4e801ee476acd5dc4 Mon Sep 17 00:00:00 2001 From: Kevin Brace Date: Thu, 2 Aug 2018 10:44:15 -0700 Subject: Deprecate R128VerboseInitEXA Signed-off-by: Kevin Brace --- 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 3023cc1..010a3cc 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) { @@ -1922,7 +1898,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 -- cgit v1.2.3