xf86-video-intel: 3 commits - README src/i830_driver.c src/i830_exa.c

[Eric Anholt]

 README            |    2 +-
 src/i830_driver.c |    4 ++--
 src/i830_exa.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree aa850d3c633a510d787ee59e538e26e5c3acbf4a (from d2e75d8acde2541b85a0050d9e47182c1db7fc2c)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 9 11:44:25 2007 -0700

    Turn off ALWAYS_SYNC in EXA.
    
    This slipped in as a debugging aid, and never got turned off.  The driver
    appears to work fine without it on an i915 system, and for the non-default EXA
    option, we'd rather see issues found than continue running with debugging aids
    and hiding them behind bad performance.

diff --git a/src/i830_exa.c b/src/i830_exa.c
index bef8fae..dfc8f99 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -42,7 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define DEBUG_I830FALLBACK 1
 #endif
 
-#define ALWAYS_SYNC		1
+#define ALWAYS_SYNC		0
 
 #ifdef DEBUG_I830FALLBACK
 #define I830FALLBACK(s, arg...)				\
diff-tree d2e75d8acde2541b85a0050d9e47182c1db7fc2c (from 9ed446e12bd21b7c8222c6e63a03a8e2ec6b97e2)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 9 11:34:57 2007 -0700

    Avoid a magic number and correct a (currently harmless) ifdef in ResetState().

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4ee720f..f0ca973 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1559,7 +1559,7 @@ ResetState(ScrnInfoPtr pScrn, Bool flush
    /* God this is ugly */
 #define flush_ring() do { \
       temp = INREG(LP_RING + RING_LEN); \
-      if (temp & 1) { \
+      if (temp & RING_VALID) { \
 	 I830RefreshRing(pScrn); \
 	 I830Sync(pScrn); \
 	 DO_RING_IDLE(); \
@@ -1569,7 +1569,7 @@ ResetState(ScrnInfoPtr pScrn, Bool flush
    if (!pI830->useEXA && flush && pI830->AccelInfoRec)
        flush_ring();
 #endif
-#ifdef I830_USE_XAA
+#ifdef I830_USE_EXA
    if (pI830->useEXA && flush && pI830->EXADriverPtr)
        flush_ring();
 #endif
diff-tree 9ed446e12bd21b7c8222c6e63a03a8e2ec6b97e2 (from d9d05b553ca1f98efc230ef13f34576122311ac1)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Apr 3 11:39:48 2007 -0700

    It's 2007 now.  Didn't I get the memo?

diff --git a/README b/README
index 788acdb..f209baa 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 Information for Intel graphics driver users
 Eric Anholt
-2006-04-02
+2007-04-02
 
 This document provides a brief summary of the Intel graphics support provided
 by the xf86-video-intel driver.  More information can also be found in the