xf86-video-intel: src/i830_driver.c

[Jesse Barnes]

 src/i830_driver.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 3ef9d85371a97ea5baee0c47787b3bb3cdaf5135
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri Mar 13 12:21:34 2009 -0700

    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.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 3c77147..c19fcc6 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;