summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2013-05-09 12:36:33 +0000
committerTormod Volden <debian.tormod@gmail.com>2013-05-09 15:55:27 +0200
commitc30f9b4a61283f21f6bd230950f52961afa203cf (patch)
treec529471badbef0f0f4e9a607aee6043f18bed481
parentca9718a887ecbc59b76869af673791ab591b849b (diff)
Really fix default accel arch when built with no XAA
After ca9718a887ecbc59b76869af673791ab591b849b it would still default to XAA unless AccelMethod option was used. Make sure the default is EXA if there is no XAA support. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
-rw-r--r--src/savage_driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 5b49e60..20c7094 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1266,8 +1266,8 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
if(!psav->NoAccel) {
from = X_DEFAULT;
char *strptr;
- if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
#ifdef HAVE_XAA_H
+ if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
if(!xf86NameCmp(strptr,"XAA")) {
from = X_CONFIG;
psav->useEXA = FALSE;
@@ -1275,10 +1275,10 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
psav->useEXA = TRUE;
}
+ }
#else
- psav->useEXA = TRUE;
+ psav->useEXA = TRUE;
#endif
- }
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
psav->useEXA ? "EXA" : "XAA");
}