avivotool: fix cmdfifo dumping + add some atombios tables

1 files changed, 8 insertions, 4 deletions

diff --git a/avivotool.c b/avivotool.c
index c08c388..6439481 100644
--- a/avivotool.c
+++ b/avivotool.c
@@ -2015,15 +2015,19 @@ void radeon_rom_tables(const char * file)
 void radeon_dump_cmdfifo(void)
 {
     int i;
-    uint32_t val;
+    uint32_t val, reg;
 
     val = radeon_get(RADEON_RBBM_CMDFIFO_STAT, "rbbm_status");
-    printf("cmdfifo: rptr %d wptr %d\n", val & 63, (val >> 8) ^ 63);
+    printf("cmdfifo: rptr %d wptr %d\n", val & 63, (val >> 8) & 63);
     radeon_set(RADEON_RBBM_CMDFIFO_ADDR, "rbbm", 0);
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < 256; i++) {
+        radeon_set(RADEON_RBBM_CMDFIFO_ADDR, "rbbm", i + 256);
+	reg = radeon_get(RADEON_RBBM_CMDFIFO_DATA, "rbbm");
+	if (reg != 0xdeadbeaf)
+		reg = ((reg >> 4) << 2) & 0xffff;
         radeon_set(RADEON_RBBM_CMDFIFO_ADDR, "rbbm", i);
 	val = radeon_get(RADEON_RBBM_CMDFIFO_DATA, "rbbm");
-	printf("%d: %08x\n", i, val);
+	printf("%d:  r=%04x = %08x\n", i, reg, val);
     }
 }