summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/hw/cdma_hw.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-06-12 13:16:54 +0200
committerThierry Reding <treding@nvidia.com>2014-11-13 16:11:35 +0100
commit0169b93f4492c74d046b456d93b37bd7b55ecd42 (patch)
tree3e5b98d7614765522cc6d84b5fc8ba55b30ff616 /drivers/gpu/host1x/hw/cdma_hw.c
parentb40d02bf96e05851d1d16b4a75f66a9e16cfb2fb (diff)
downloadtalos-obmc-linux-0169b93f4492c74d046b456d93b37bd7b55ecd42.tar.gz
talos-obmc-linux-0169b93f4492c74d046b456d93b37bd7b55ecd42.zip
gpu: host1x: Make mapped field of push buffers void *
This reduces the amount of casting that needs to be done to get rid of annoying warnings on 64-bit builds. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/hw/cdma_hw.c')
-rw-r--r--drivers/gpu/host1x/hw/cdma_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c
index 6b09b71940c2..a1197c40a454 100644
--- a/drivers/gpu/host1x/hw/cdma_hw.c
+++ b/drivers/gpu/host1x/hw/cdma_hw.c
@@ -30,7 +30,7 @@
*/
static void push_buffer_init(struct push_buffer *pb)
{
- *(pb->mapped + (pb->size_bytes >> 2)) = host1x_opcode_restart(0);
+ *(u32 *)(pb->mapped + pb->size_bytes) = host1x_opcode_restart(0);
}
/*
@@ -51,7 +51,7 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr,
/* NOP all the PB slots */
while (nr_slots--) {
- u32 *p = (u32 *)((u32)pb->mapped + getptr);
+ u32 *p = (u32 *)(pb->mapped + getptr);
*(p++) = HOST1X_OPCODE_NOP;
*(p++) = HOST1X_OPCODE_NOP;
dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__,
OpenPOWER on IntegriCloud