diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-13 12:21:34 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-13 12:21:34 -0700 |
| commit | 3ef9d85371a97ea5baee0c47787b3bb3cdaf5135 (patch) | |
| tree | 4412609d29e588fa8446d8cbba48104291df38a0 | |
| parent | dc3ff0b514b609448025680778f0e95e1980a5d8 (diff) | |
Use UXA when KMS is active
EXA doesn't support KMS, so force UXA on if KMS is detected. And warn
the user if they've specified something other than UXA in their
xorg.conf.
Fixes bug #20620.
| -rw-r--r-- | src/i830_driver.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 3c771472..c19fcc63 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1703,12 +1703,8 @@ I830DrmModeInit(ScrnInfoPtr pScrn) pI830->accel = ACCEL_UXA; if ((s = (char *)xf86GetOptValString(pI830->Options, OPTION_ACCELMETHOD))) { - if (!xf86NameCmp(s, "EXA")) - pI830->accel = ACCEL_EXA; - else if (!xf86NameCmp(s, "UXA")) - pI830->accel = ACCEL_UXA; - else - pI830->accel = ACCEL_UXA; + if (xf86NameCmp(s, "UXA")) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "kernel mode setting active,overridding accelmethod and using UXA\n"); } pI830->can_resize = FALSE; |