Deprecate R128EXAAccelInit

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>

3 files changed, 21 insertions, 41 deletions

diff --git a/src/r128.h b/src/r128.h
index 032c40b..2df674f 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -604,7 +604,6 @@ extern int         R128CCEStop(ScrnInfoPtr pScrn);
 extern void	   R128CopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap);
 
 #ifdef USE_EXA
-extern Bool R128EXAAccelInit(ScreenPtr pScreen);
 extern Bool	   R128EXAInit(ScreenPtr pScreen);
 extern Bool	   R128GetDatatypeBpp(int bpp, uint32_t *type);
 extern Bool	   R128GetPixmapOffsetPitch(PixmapPtr pPix, uint32_t *pitch_offset);
diff --git a/src/r128_driver.c b/src/r128_driver.c
index a8cdb20..6960a19 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1674,15 +1674,6 @@ R128AccelInit(Bool noAccel, ScreenPtr pScreen)
     R128InfoPtr info   = R128PTR(pScrn);
 
     if (!noAccel) {
-        if (info->useEXA) {
-#ifdef USE_EXA
-            if (R128EXAAccelInit(pScreen)) {
-                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                            "EXA acceleration enabled.\n");
-            }
-#endif
-        }
-
         if ((!info->useEXA) ||
             ((info->useEXA) && (!info->accelOn))) {
 #ifdef HAVE_XAA_H
@@ -1924,22 +1915,31 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 	    }
 	}
 #ifdef USE_EXA
-	else {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "Filling in EXA memory info\n");
+    else {
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                    "Filling in EXA memory info\n");
 
-            R128AccelInit(info->noAccel, pScreen);
-	    info->ExaDriver->offScreenBase = pScrn->virtualY * width_bytes;
+        info->ExaDriver = exaDriverAlloc();
+        if (!info->ExaDriver) {
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Could not allocate EXA driver...\n");
+            info->accelOn = FALSE;
+        } else {
+            info->ExaDriver->offScreenBase = pScrn->virtualY * width_bytes;
 
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "Filled in offs\n");
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Filled in offs\n");
 
-	    /* Don't give EXA the true full memory size, because the
-	       textureSize sized chunk on the end is handled by DRI */
-	    info->ExaDriver->memorySize = total;
+            /*
+             * Don't give EXA the true full memory size, because
+             * the textureSize sized chunk on the end is handled
+             * by DRI.
+             */
+            info->ExaDriver->memorySize = total;
 
-	    R128VerboseInitEXA(pScreen);
-	}
+            R128VerboseInitEXA(pScreen);
+        }
+    }
 #endif
 
 #ifdef R128DRI
diff --git a/src/r128_exa.c b/src/r128_exa.c
index 5a54740..b7501ac 100644
--- a/src/r128_exa.c
+++ b/src/r128_exa.c
@@ -394,25 +394,6 @@ R128CCESync(ScreenPtr pScreen, int marker)
 #endif
 
 Bool
-R128EXAAccelInit(ScreenPtr pScreen)
-{
-    ScrnInfoPtr   pScrn = xf86ScreenToScrn(pScreen);
-    R128InfoPtr   info  = R128PTR(pScrn);
-
-    /* Don't init EXA here because it'll be taken care of in mm init */
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                "Allocating EXA driver...\n");
-    info->ExaDriver = exaDriverAlloc();
-    if (!info->ExaDriver) {
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                    "Could not allocate EXA driver...\n");
-        info->accelOn = FALSE;
-    }
-
-    return TRUE;
-}
-
-Bool
 R128EXAInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);