From fe2e6100ece780437c622c8469efbec2b98f7a6f Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Sun, 19 Nov 2006 22:16:54 +0000
Subject: [PATCH] More fifo debug fixes

---
 src/mesa/drivers/dri/nouveau/nouveau_fifo.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
index 92acc002d98..b738fa8ee1c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "nouveau_context.h"
 #include "nouveau_ctrlreg.h"
 
-#define NOUVEAU_RING_DEBUG
+//#define NOUVEAU_RING_DEBUG
 
 #define NV_READ(reg) *(volatile u_int32_t *)(nmesa->mmio + (reg))
 
@@ -59,15 +59,16 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef NOUVEAU_RING_DEBUG
 
 #define OUT_RINGp(ptr,sz) do {                                                  \
-int i; printf("OUT_RINGp:\n"); for(i=0;i<sz;i+=4) printf(" 0x%8x\n", ptr+sz);   \
+uint32_t* p=(uint32_t*)ptr;							\
+int i; printf("OUT_RINGp:\n"); for(i=0;i<sz;i++) printf(" 0x%08x\n", *(p+i)); 	\
 }while(0)
 
 #define OUT_RING(n) do {                                                        \
-    printf("OUT_RINGn: 0x%8x\n", n);                                            \
+    printf("OUT_RINGn: 0x%08x\n", n);                                           \
 }while(0)
 
 #define OUT_RINGf(n) do {                                                       \
-    printf("OUT_RINGf: 0x%8x\n", n);                                            \
+    printf("OUT_RINGf: 0x%08x\n", n);                                           \
 }while(0)
 
 #else
-- 
2.30.2