aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/hw/debug_hw_1x06.c
diff options
context:
space:
mode:
authorMikko Perttunen <[email protected]>2017-09-28 12:50:41 +0000
committerThierry Reding <[email protected]>2017-10-20 12:19:52 +0000
commiteb2ee1a28db17155bcee4630e36ea1759b7e10dc (patch)
tree63942452c69d2a896ca682cfe623ff9c963523b0 /drivers/gpu/host1x/hw/debug_hw_1x06.c
parentgpu: host1x: Enable gather filter (diff)
downloadkernel-eb2ee1a28db17155bcee4630e36ea1759b7e10dc.tar.gz
kernel-eb2ee1a28db17155bcee4630e36ea1759b7e10dc.zip
gpu: host1x: Improve debug disassembly formatting
The host1x driver prints out "disassembly" dumps of the command FIFO and gather contents on submission timeouts. However, the output has been quite difficult to read with unnecessary newlines and occasional missing parentheses. Fix these problems by using pr_cont to remove unnecessary newlines and by fixing other small issues. Signed-off-by: Mikko Perttunen <[email protected]> Reviewed-by: Dmitry Osipenko <[email protected]> Tested-by: Dmitry Osipenko <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
Diffstat (limited to 'drivers/gpu/host1x/hw/debug_hw_1x06.c')
-rw-r--r--drivers/gpu/host1x/hw/debug_hw_1x06.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/hw/debug_hw_1x06.c b/drivers/gpu/host1x/hw/debug_hw_1x06.c
index 9cdee657fb46..bd89da5dc64c 100644
--- a/drivers/gpu/host1x/hw/debug_hw_1x06.c
+++ b/drivers/gpu/host1x/hw/debug_hw_1x06.c
@@ -105,11 +105,12 @@ static void host1x_debug_show_channel_fifo(struct host1x *host,
HOST1X_HV_CMDFIFO_PEEK_READ);
if (!data_count) {
- host1x_debug_output(o, "%08x:", val);
+ host1x_debug_output(o, "%03x 0x%08x: ",
+ rd_ptr - start, val);
data_count = show_channel_command(o, val);
} else {
- host1x_debug_output(o, "%08x%s", val,
- data_count > 0 ? ", " : "])\n");
+ host1x_debug_cont(o, "%08x%s", val,
+ data_count > 1 ? ", " : "])\n");
data_count--;
}
@@ -120,7 +121,7 @@ static void host1x_debug_show_channel_fifo(struct host1x *host,
} while (rd_ptr != wr_ptr);
if (data_count)
- host1x_debug_output(o, ", ...])\n");
+ host1x_debug_cont(o, ", ...])\n");
host1x_debug_output(o, "\n");
host1x_hypervisor_writel(host, 0x0, HOST1X_HV_CMDFIFO_PEEK_CTRL);