summaryrefslogtreecommitdiff
path: root/src
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-15 06:40:32 +0800
commitfb84568d66aa9fe083da8ad34c1a847849622bd9 (patch)
tree0bff54d7c2e6536aeedab7484a74dae43d875733 /src
parentc755187b695cd9093084fcf59bce57f00d959fb1 (diff)
Don't warn on ring enabled in GEM
(cherry picked from commit 80d588e9c49719ec494e705edfc14c78908bbc3f)
Diffstat (limited to 'src')
-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++;