[PATCH xf86-video-savage] Disable EXA acceleration for now

[Kevin Brace]

EXA acceleration architecture code is currently broken on X Server
1.19, so it should be disabled until it is fixed.

Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
---
 src/savage_driver.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/savage_driver.c b/src/savage_driver.c
index 01fc0bc..e26b0f1 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1273,14 +1273,29 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
 	        psav->useEXA = FALSE;
 	    } else if(!xf86NameCmp(strptr,"EXA")) {
 	       from = X_CONFIG;
-	       psav->useEXA = TRUE;
+	       psav->NoAccel = TRUE;
+	       psav->useEXA = FALSE;
+	       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	                   "EXA acceleration architecture is "
+	                   "permanently disabled for this version.\n");
 	    }
         }
 #else
-	psav->useEXA = TRUE;
+	psav->NoAccel = TRUE;
+	psav->useEXA = FALSE;
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	            "EXA acceleration architecture is "
+	            "permanently disabled for this version.\n");
 #endif
-       xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
-		psav->useEXA ? "EXA" : "XAA");
+
+	if (!psav->NoAccel) {
+	    xf86DrvMsg(pScrn->scrnIndex, from,
+	                "Using %s acceleration architecture\n",
+	                psav->useEXA ? "EXA" : "XAA");
+	} else {
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	                "Hardware acceleration is disabled.\n");
+	}
     }
 
     if ((s = xf86GetOptValString(psav->Options, OPTION_OVERLAY))) {
-- 
2.7.4