diff options
author | Eric Anholt <eric@anholt.net> | 2007-04-09 11:34:57 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-04-09 11:34:57 -0700 |
commit | d2e75d8acde2541b85a0050d9e47182c1db7fc2c (patch) | |
tree | c265164f9f81a7d9ef27570d8f56a40dc05363cf /src/i830_driver.c | |
parent | 9ed446e12bd21b7c8222c6e63a03a8e2ec6b97e2 (diff) |
Avoid a magic number and correct a (currently harmless) ifdef in ResetState().
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r-- | src/i830_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 4ee720fe..f0ca9739 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 |