Commit 0169b93f authored by Thierry Reding's avatar Thierry Reding

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: default avatarThierry Reding <treding@nvidia.com>
parent b40d02bf
...@@ -97,7 +97,7 @@ static int host1x_pushbuffer_init(struct push_buffer *pb) ...@@ -97,7 +97,7 @@ static int host1x_pushbuffer_init(struct push_buffer *pb)
static void host1x_pushbuffer_push(struct push_buffer *pb, u32 op1, u32 op2) static void host1x_pushbuffer_push(struct push_buffer *pb, u32 op1, u32 op2)
{ {
u32 pos = pb->pos; u32 pos = pb->pos;
u32 *p = (u32 *)((u32)pb->mapped + pos); u32 *p = (u32 *)((void *)pb->mapped + pos);
WARN_ON(pos == pb->fence); WARN_ON(pos == pb->fence);
*(p++) = op1; *(p++) = op1;
*(p++) = op2; *(p++) = op2;
......
...@@ -42,7 +42,7 @@ struct host1x_job; ...@@ -42,7 +42,7 @@ struct host1x_job;
*/ */
struct push_buffer { struct push_buffer {
u32 *mapped; /* mapped pushbuffer memory */ void *mapped; /* mapped pushbuffer memory */
dma_addr_t phys; /* physical address of pushbuffer */ dma_addr_t phys; /* physical address of pushbuffer */
u32 fence; /* index we've written */ u32 fence; /* index we've written */
u32 pos; /* index to write to */ u32 pos; /* index to write to */
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
*/ */
static void push_buffer_init(struct push_buffer *pb) 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, ...@@ -51,7 +51,7 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr,
/* NOP all the PB slots */ /* NOP all the PB slots */
while (nr_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;
*(p++) = HOST1X_OPCODE_NOP; *(p++) = HOST1X_OPCODE_NOP;
dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment