diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-13 12:21:34 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-03-16 14:13:13 -0700 |
| commit | d7e1543a618c54f1baeea7dd1ac54bb37e309fec (patch) | |
| tree | cc79c59eb19bb10eecf1e21e94a839ac8d671a98 /src | |
| parent | e87bcd19a608aa964d6ea43ca5a19aed2efc818d (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.
(cherry picked from commit 3ef9d85371a97ea5baee0c47787b3bb3cdaf5135)
Diffstat (limited to 'src')
| -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 6ec1a486..3ba57622 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1707,12 +1707,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; |