diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-14 15:39:57 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-14 15:39:57 -0700 |
| commit | 380c80712f78b3673b64ea07746a8e25e15fba8e (patch) | |
| tree | b8bcdbb4900aaeb398b4f46672c1918187fa663c | |
| parent | 4475dfb541c988ad19b177e60f31f333e2fb3355 (diff) | |
Fixup AccelMethod kernel mode setting code
Allow UXA or EXA in the kernel mode setting case, defaulting to EXA.
| -rw-r--r-- | src/i830_driver.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 3ad811e4..289f8b89 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1648,6 +1648,19 @@ I830DrmModeInit(ScrnInfoPtr pScrn) #ifdef XF86DRM_MODE I830Ptr pI830 = I830PTR(pScrn); char *bus_id; + char *s; + + /* Default to EXA but allow override */ + pI830->accel = ACCEL_EXA; + + 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_EXA; + } bus_id = DRICreatePCIBusID(pI830->PciInfo); if (drmmode_pre_init(pScrn, &pI830->drmmode, bus_id, "i915", @@ -1664,7 +1677,6 @@ I830DrmModeInit(ScrnInfoPtr pScrn) pI830->drmSubFD = pI830->drmmode.fd; xfree(bus_id); - pI830->accel = ACCEL_EXA; pI830->directRenderingDisabled = FALSE; pI830->allocate_classic_textures = FALSE; |