diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 06:37:03 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 06:38:16 +0100 |
| commit | fe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch) | |
| tree | 8dd536be0e16e86109295142edd1ef1fd18c2e98 /drivers/gpu/host1x/hw | |
| parent | Merge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Linux 3.13-rc5 (diff) | |
| download | linux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.tar.xz linux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.zip | |
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.
Linux 3.13-rc5
Diffstat (limited to 'drivers/gpu/host1x/hw')
| -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 37e2a63241a9..6b09b71940c2 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, u32 *p = (u32 *)((u32)pb->mapped + getptr); *(p++) = HOST1X_OPCODE_NOP; *(p++) = HOST1X_OPCODE_NOP; - dev_dbg(host1x->dev, "%s: NOP at 0x%x\n", __func__, - pb->phys + getptr); + dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, + (u64)pb->phys + getptr); getptr = (getptr + 8) & (pb->size_bytes - 1); } wmb(); diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c index 640c75ca5a8b..f72c873eff81 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) continue; } - host1x_debug_output(o, " GATHER at %08x+%04x, %d words\n", - g->base, g->offset, g->words); + host1x_debug_output(o, " GATHER at %#llx+%04x, %d words\n", + (u64)g->base, g->offset, g->words); show_gather(o, g->base + g->offset, g->words, cdma, g->base, mapped); |