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.
This commit is contained in:
Jesse Barnes 2009-03-13 12:21:34 -07:00
parent dc3ff0b514
commit 3ef9d85371
1 changed files with 2 additions and 6 deletions

View File

@ -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;