gpu: host1x: debug: Dump only relevant parts of CDMA push buffer

[linux-2.6-microblaze.git] / drivers / gpu / host1x / hw / debug_hw.c

diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c
index ceb4822..54e31d8 100644 (file)
--- a/drivers/gpu/host1x/hw/debug_hw.c
+++ b/drivers/gpu/host1x/hw/debug_hw.c
@@ -156,9 +156,9 @@ static unsigned int show_channel_command(struct output *o, u32 val,
        }
 }
 
-static void show_gather(struct output *o, phys_addr_t phys_addr,
+static void show_gather(struct output *o, dma_addr_t phys_addr,
                        unsigned int words, struct host1x_cdma *cdma,
-                       phys_addr_t pin_addr, u32 *map_addr)
+                       dma_addr_t pin_addr, u32 *map_addr)
 {
        /* Map dmaget cursor to corresponding mem handle */
        u32 offset = phys_addr - pin_addr;
@@ -176,11 +176,11 @@ static void show_gather(struct output *o, phys_addr_t phys_addr,
        }
 
        for (i = 0; i < words; i++) {
-               u32 addr = phys_addr + i * 4;
+               dma_addr_t addr = phys_addr + i * 4;
                u32 val = *(map_addr + offset / 4 + i);
 
                if (!data_count) {
-                       host1x_debug_output(o, "%08x: %08x: ", addr, val);
+                       host1x_debug_output(o, "    %pad: %08x: ", &addr, val);
                        data_count = show_channel_command(o, val, &payload);
                } else {
                        host1x_debug_cont(o, "%08x%s", val,
@@ -195,23 +195,25 @@ static void show_channel_gathers(struct output *o, struct host1x_cdma *cdma)
        struct push_buffer *pb = &cdma->push_buffer;
        struct host1x_job *job;
 
-       host1x_debug_output(o, "PUSHBUF at %pad, %u words\n",
-                           &pb->dma, pb->size / 4);
-
-       show_gather(o, pb->dma, pb->size / 4, cdma, pb->dma, pb->mapped);
-
        list_for_each_entry(job, &cdma->sync_queue, list) {
                unsigned int i;
 
-               host1x_debug_output(o, "\n%p: JOB, syncpt_id=%d, syncpt_val=%d, first_get=%08x, timeout=%d num_slots=%d, num_handles=%d\n",
-                                   job, job->syncpt->id, job->syncpt_end,
-                                   job->first_get, job->timeout,
+               host1x_debug_output(o, "JOB, syncpt %u: %u timeout: %u num_slots: %u num_handles: %u\n",
+                                   job->syncpt->id, job->syncpt_end, job->timeout,
                                    job->num_slots, job->num_unpins);
 
-               for (i = 0; i < job->num_gathers; i++) {
-                       struct host1x_job_gather *g = &job->gathers[i];
+               show_gather(o, pb->dma + job->first_get, job->num_slots * 2, cdma,
+                           pb->dma + job->first_get, pb->mapped + job->first_get);
+
+               for (i = 0; i < job->num_cmds; i++) {
+                       struct host1x_job_gather *g;
                        u32 *mapped;
 
+                       if (job->cmds[i].is_wait)
+                               continue;
+
+                       g = &job->cmds[i].gather;
+
                        if (job->gather_copy_mapped)
                                mapped = (u32 *)job->gather_copy_mapped;
                        else
@@ -222,7 +224,7 @@ static void show_channel_gathers(struct output *o, struct host1x_cdma *cdma)
                                continue;
                        }
 
-                       host1x_debug_output(o, "    GATHER at %pad+%#x, %d words\n",
+                       host1x_debug_output(o, "  GATHER at %pad+%#x, %d words\n",
                                            &g->base, g->offset, g->words);
 
                        show_gather(o, g->base + g->offset, g->words, cdma,