diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
--- xf86-video-intel-2.5.96.0/src/i830_driver.c	2008-09-27 18:19:07.000000000 +0800
+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c	2008-09-27 18:20:13.000000000 +0800
@@ -1511,12 +1511,12 @@
      * for example. :)
      */
     if (!(pI830->accel == ACCEL_NONE)) {
-#ifdef I830_USE_UXA
-	pI830->accel = ACCEL_UXA;
-#endif
 #ifdef I830_USE_EXA
 	pI830->accel = ACCEL_EXA;
 #endif
+#ifdef I830_USE_UXA
+	pI830->accel = ACCEL_UXA;
+#endif
 #if I830_USE_XAA + I830_USE_EXA + I830_USE_UXA >= 2
 	from = X_DEFAULT;
 	if ((s = (char *)xf86GetOptValString(pI830->Options,
@@ -3106,7 +3106,7 @@
 #endif
 
    /* Enable tiling by default */
-   pI830->tiling = TRUE;
+   pI830->tiling = FALSE;
 
    /* Allow user override if they set a value */
    if (xf86IsOptionSet(pI830->Options, OPTION_TILING)) {