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>

diff --git a/drivers/gpu/host1x/cdma.c b/drivers/gpu/host1x/cdma.c
index 3995255b16c753731420cb8283992c17c33ddf2e..5a8c8d55317ab4f622c5754f509d5d3660a3e47c 100644 (file)
--- a/drivers/gpu/host1x/cdma.c
+++ b/drivers/gpu/host1x/cdma.c
@@ -97,7 +97,7 @@ fail:
 static void host1x_pushbuffer_push(struct push_buffer *pb, u32 op1, u32 op2)
 {
        u32 pos = pb->pos;
-       u32 *p = (u32 *)((u32)pb->mapped + pos);
+       u32 *p = (u32 *)((void *)pb->mapped + pos);
        WARN_ON(pos == pb->fence);
        *(p++) = op1;
        *(p++) = op2;

diff --git a/drivers/gpu/host1x/cdma.h b/drivers/gpu/host1x/cdma.h
index 313c4b7843483ab4d0b6d31c1d76d754e2320b38..470087af8fe520681ba3cc8457646343f16f6aee 100644 (file)
--- a/drivers/gpu/host1x/cdma.h
+++ b/drivers/gpu/host1x/cdma.h
@@ -42,7 +42,7 @@ struct host1x_job;
  */
 
 struct push_buffer {
-       u32 *mapped;                    /* mapped pushbuffer memory */
+       void *mapped;                   /* mapped pushbuffer memory */
        dma_addr_t phys;                /* physical address of pushbuffer */
        u32 fence;                      /* index we've written */
        u32 pos;                        /* index to write to */

diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c
index 6b09b71940c2d5df0251ec2b3cd417ec2eb93e2d..a1197c40a4542b80deacac67f031a24dbaedf98b 100644 (file)
--- 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__,