summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-04-13 18:57:02 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2007-09-07 18:56:40 +0200
commitb30088474064f1cc380c26a5bc656e4802567499 (patch)
treeb0d67b14033d88fecb0ee2e3c4303e74c10bac12
parent74fbc94a529de01b3bbf8b33776a3210552f2275 (diff)
Extend i830 lockup debugging output.i945-zone-rendering
-rw-r--r--src/i830_debug.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 8b4b76f4..9c00b2e9 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -777,16 +777,28 @@ i830_dump_error_state(ScrnInfoPtr pScrn)
(unsigned long)INREG(LP_RING + RING_LEN),
(unsigned long)INREG(LP_RING + RING_START));
+#ifdef XF86DRI
+ if (pI830->hwz) {
+ ErrorF("HWB ring tail: %lx head: %lx len: %lx start %lx\n",
+ (unsigned long)INREG(HWB_RING + RING_TAIL),
+ (unsigned long)INREG(HWB_RING + RING_HEAD) & HEAD_ADDR,
+ (unsigned long)INREG(HWB_RING + RING_LEN),
+ (unsigned long)INREG(HWB_RING + RING_START));
+ }
+#endif
+
ErrorF("eir: %x esr: %x emr: %x\n",
INREG16(EIR), INREG16(ESR), INREG16(EMR));
- ErrorF("instdone: %x instpm: %x\n", INREG16(INST_DONE), INREG8(INST_PM));
+ ErrorF("instdone: %x instpm: %x\n", (unsigned)INREG(INST_DONE),
+ INREG8(INST_PM));
ErrorF("memmode: %lx instps: %lx\n", (unsigned long)INREG(MEMMODE),
(unsigned long)INREG(INST_PS));
ErrorF("hwstam: %x ier: %x imr: %x iir: %x\n",
- INREG16(HWSTAM), INREG16(IER), INREG16(IMR), INREG16(IIR));
+ INREG16(HWSTAM), (unsigned)INREG(IER), (unsigned)INREG(IMR),
+ (unsigned)INREG(IIR));
i830_dump_ring (pScrn);
}