diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-05-04 13:40:17 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2009-05-04 13:40:17 -0400 |
commit | 2c8e130f73c680d4a7381b2ef37982b82c6ee478 (patch) | |
tree | 6e186cf5351ae69ea8417be71aa5ce2f788b2b21 | |
parent | 8155a62df6817358a12cc2d613c1470ca55996ef (diff) |
radeon: switch to EXA by default
-rw-r--r-- | man/radeon.man | 5 | ||||
-rw-r--r-- | src/radeon_driver.c | 18 |
2 files changed, 10 insertions, 13 deletions
diff --git a/man/radeon.man b/man/radeon.man index 9b0d292f..703fe1d7 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -346,9 +346,8 @@ and .B EXA. XAA is the traditional acceleration architecture and support for it is very stable. EXA is a newer acceleration architecture with better performance for -the Render and Composite extensions, but the rendering code for it is newer and -possibly unstable. The default is -.B XAA. +the Render and Composite extensions. The default is +.B EXA. .TP .BI "Option \*qAccelDFS\*q \*q" boolean \*q Use or don't use accelerated EXA DownloadFromScreen hook when possible (only diff --git a/src/radeon_driver.c b/src/radeon_driver.c index a56df496..8a2a978e 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2081,13 +2081,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) info->accel_state->has_tcl = TRUE; } - info->useEXA = FALSE; - - if (info->ChipFamily >= CHIP_FAMILY_R600) { - xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, - "Will attempt to use R6xx/R7xx EXA support if DRI is enabled.\n"); - info->useEXA = TRUE; - } + info->useEXA = TRUE; if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { int errmaj = 0, errmin = 0; @@ -2097,11 +2091,12 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) #if defined(USE_XAA) optstr = (char *)xf86GetOptValString(info->Options, OPTION_ACCELMETHOD); if (optstr != NULL) { - if (xf86NameCmp(optstr, "EXA") == 0) { + if (xf86NameCmp(optstr, "EXA") == 0) from = X_CONFIG; - info->useEXA = TRUE; - } else if (xf86NameCmp(optstr, "XAA") == 0) { + else if (xf86NameCmp(optstr, "XAA") == 0) { from = X_CONFIG; + if (info->ChipFamily < CHIP_FAMILY_R600) + info->useEXA = FALSE; } } #else /* USE_XAA */ @@ -2112,6 +2107,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", info->useEXA ? "EXA" : "XAA"); + else + xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT, + "Will attempt to use R6xx/R7xx EXA support if DRI is enabled.\n"); #ifdef USE_EXA if (info->useEXA) { |