diff options
author | Thierry Reding <treding@nvidia.com> | 2014-06-12 07:24:17 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-13 10:11:41 -0500 |
commit | ba73fbc2ca221e80c6733e68496ad07bc3b58ff8 (patch) | |
tree | bf00fd29391c5fb02c6df1fa20d2c25fa8609f67 | |
parent | 7f27d60b28f6dbc9762407aac596b53f2a71a867 (diff) |
gpu: host1x: Print address/offset pairs consistently
Consistently use a format of %pad+%#x to print address/offset in debug
messages.
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/gpu/host1x/hw/cdma_hw.c | 4 | ||||
-rw-r--r-- | drivers/gpu/host1x/hw/debug_hw.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c index 072d8209c06c..305ea8f3382d 100644 --- a/drivers/gpu/host1x/hw/cdma_hw.c +++ b/drivers/gpu/host1x/hw/cdma_hw.c | |||
@@ -54,8 +54,8 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr, | |||
54 | u32 *p = (u32 *)(pb->mapped + getptr); | 54 | u32 *p = (u32 *)(pb->mapped + getptr); |
55 | *(p++) = HOST1X_OPCODE_NOP; | 55 | *(p++) = HOST1X_OPCODE_NOP; |
56 | *(p++) = HOST1X_OPCODE_NOP; | 56 | *(p++) = HOST1X_OPCODE_NOP; |
57 | dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, | 57 | dev_dbg(host1x->dev, "%s: NOP at %pad+%#x\n", __func__, |
58 | (u64)pb->phys + getptr); | 58 | &pb->phys, getptr); |
59 | getptr = (getptr + 8) & (pb->size_bytes - 1); | 59 | getptr = (getptr + 8) & (pb->size_bytes - 1); |
60 | } | 60 | } |
61 | wmb(); | 61 | wmb(); |
diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c index f72c873eff81..791de9351eeb 100644 --- a/drivers/gpu/host1x/hw/debug_hw.c +++ b/drivers/gpu/host1x/hw/debug_hw.c | |||
@@ -163,8 +163,8 @@ static void show_channel_gathers(struct output *o, struct host1x_cdma *cdma) | |||
163 | continue; | 163 | continue; |
164 | } | 164 | } |
165 | 165 | ||
166 | host1x_debug_output(o, " GATHER at %#llx+%04x, %d words\n", | 166 | host1x_debug_output(o, " GATHER at %pad+%#x, %d words\n", |
167 | (u64)g->base, g->offset, g->words); | 167 | &g->base, g->offset, g->words); |
168 | 168 | ||
169 | show_gather(o, g->base + g->offset, g->words, cdma, | 169 | show_gather(o, g->base + g->offset, g->words, cdma, |
170 | g->base, mapped); | 170 | g->base, mapped); |