summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2006-12-15 13:23:48 -0700
committerJordan Crouse <jordan.crouse@amd.com>2006-12-15 13:24:36 -0700
commit8cd3fa16e377119452d8575198a7f1f1a77e44fc (patch)
tree33edf2077f49317c8f9216042a9d1d302bcdf16d /src
parent04e5aa4e6e9ec4ddc8ebeaf9f7004cb832c194c8 (diff)
Default the GX driver to use EXA for acceleration
Diffstat (limited to 'src')
-rw-r--r--src/amd_gx_driver.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c
index f4578fa..4321134 100644
--- a/src/amd_gx_driver.c
+++ b/src/amd_gx_driver.c
@@ -583,8 +583,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
pGeode->tryCompression = TRUE;
pGeode->NoAccel = FALSE;
- pGeode->CustomMode = FALSE;
- pGeode->useEXA = FALSE;
+ pGeode->useEXA = TRUE;
if (pGeode->DetectedChipSet == GX_TFT)
pGeode->Panel = TRUE;
@@ -650,8 +649,11 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
panelgeo = xf86GetOptValString(GeodeOptions, GX_OPTION_PANEL_GEOMETRY);
if ((s = xf86GetOptValString(GeodeOptions, GX_OPTION_ACCEL_METHOD))) {
- if (!xf86NameCmp(s, "EXA"))
- pGeode->useEXA = TRUE;
+ if (!xf86NameCmp(s, "XAA"))
+ pGeode->useEXA = FALSE;
+ else if (xf86NameCmp(s, "EXA"))
+ xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
+ "Unknown accleration method %s. Defaulting to EXA.\n", s);
}
xf86DrvMsg(pScrni->scrnIndex, X_INFO,
@@ -770,13 +772,9 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
xf86LoaderReqSymLists(amdFbSymbols, NULL);
if (pGeode->NoAccel == FALSE) {
- const char *module = "xaa";
- const char **symbols = &amdXaaSymbols[0];
-
- if (pGeode->useEXA) {
- module = "exa";
- symbols = &amdExaSymbols[0];
- }
+ const char *module = (pGeode->useEXA) ? "exa" : "xaa";
+ const char **symbols = (pGeode->useEXA) ?
+ &amdExaSymbols[0] : &amdXaaSymbols[0];
if (!xf86LoadSubModule(pScrni, module)) {
GXFreeRec(pScrni);