diff options
| author | Carl Worth <cworth@cworth.org> | 2009-04-15 16:10:52 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-04-15 16:15:15 -0700 |
| commit | 3fafb28a4323c6897bfe36882857bf89e5d88de8 (patch) | |
| tree | 0372842593d6b2d4f179a150189585c6753fce83 | |
| parent | 0f0569b5658fbaf3b84232f13a28f6633a89e9b9 (diff) | |
Clarify that the default acceleration is UXA if KMS is available.
Stale documentation considered harmful of course.
(cherry picked from commit 506c810f8f3db89048dda9777902f142ffeb86aa)
| -rw-r--r-- | man/intel.man | 2 | ||||
| -rw-r--r-- | src/i830_driver.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/man/intel.man b/man/intel.man index f85d3d1f..4f8db817 100644 --- a/man/intel.man +++ b/man/intel.man @@ -154,7 +154,7 @@ UXA is a newer acceleration architecture built from the EXA acceleration code but taking advantage of kernel memory management to provide simpler, faster code. .IP -Default: "EXA". +Default: "UXA" if kernel-modesetting is available, "EXA" otherwise. .TP .BI "Option \*qModeDebug\*q \*q" boolean \*q Enable printing of additional debugging information about modesetting to diff --git a/src/i830_driver.c b/src/i830_driver.c index 32ca6c9a..48e23510 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1604,8 +1604,11 @@ I830AccelMethodInit(ScrnInfoPtr pScrn) * config option AccelMethod to determine which to use, defaulting to EXA * if none is specified, or if the string was unrecognized. * - * All this *could* go away if we removed XAA support from this driver, - * for example. :) + * Then, just to make things more confusing, the default EXA will + * be overridden to UXA if KMS is available. See I830DrmModeInit. + * + * All this *will* go away when we remov XAA and EXA support from + * this driver. (And there will be much rejoicing.) */ if (!(pI830->accel == ACCEL_NONE)) { #ifdef I830_USE_UXA |