Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/host1x/cdma.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	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;

drivers/gpu/host1x/cdma.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/host1x/hw/cdma_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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__,