summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2008-12-12 18:27:29 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-12-12 18:27:29 +0800
commit80d588e9c49719ec494e705edfc14c78908bbc3f (patch)
treebaabd1b572d055c16884ff0a981c20779ccf211f
parent60c4ee9ece8ea57e61b1590dfeb69d08555e465c (diff)
Don't warn on ring enabled in GEM
-rw-r--r--src/i830_debug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 17ee40fa..8ce6ce66 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -1762,7 +1762,7 @@ i830_check_error_state(ScrnInfoPtr pScrn)
errors++;
}
temp = INREG(LP_RING + RING_LEN);
- if (temp & 1) {
+ if (!pI830->memory_manager && (temp & 1)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"PRB0_CTL (0x%08lx) indicates ring buffer enabled\n", temp);
errors++;