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

Commit ebae30b1 authored by Arto Merilainen's avatar Arto Merilainen Committed by Thierry Reding
Browse files

gpu: host1x: Rework CPU syncpoint increment 



This patch merges host1x_syncpt_cpu_incr to host1x_syncpt_incr() as
they are in practise doing the same thing. host1x_syncpt_incr() is
also modified to return error codes. User space interface is modified
accordingly to pass return values.

Signed-off-by: default avatarArto Merilainen <amerilainen@nvidia.com>
Acked-By: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent ece66891

drivers/gpu/host1x/dev.h

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct host1x_syncpt_ops { 
	void (*restore_wait_base)(struct host1x_syncpt *syncpt);

	void (*load_wait_base)(struct host1x_syncpt *syncpt);

	u32 (*load)(struct host1x_syncpt *syncpt);

	void (*cpu_incr)(struct host1x_syncpt *syncpt);

	int (*cpu_incr)(struct host1x_syncpt *syncpt);

	int (*patch_wait)(struct host1x_syncpt *syncpt, void *patch_addr);

};
@@ -157,10 +157,10 @@ static inline u32 host1x_hw_syncpt_load(struct host1x *host, 
	return host->syncpt_op->load(sp);

}



static inline void host1x_hw_syncpt_cpu_incr(struct host1x *host,

static inline int host1x_hw_syncpt_cpu_incr(struct host1x *host,

					    struct host1x_syncpt *sp)

{

	host->syncpt_op->cpu_incr(sp);

	return host->syncpt_op->cpu_incr(sp);

}



static inline int host1x_hw_syncpt_patch_wait(struct host1x *host,

drivers/gpu/host1x/drm/drm.c

+1 −2
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ static int tegra_syncpt_incr(struct drm_device *drm, void *data, 
	if (!sp)

		return -EINVAL;



	host1x_syncpt_incr(sp);

	return 0;

	return host1x_syncpt_incr(sp);

}



static int tegra_syncpt_wait(struct drm_device *drm, void *data,

drivers/gpu/host1x/hw/cdma_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr, 
	u32 i;



	for (i = 0; i < syncpt_incrs; i++)

		host1x_syncpt_cpu_incr(cdma->timeout.syncpt);

		host1x_syncpt_incr(cdma->timeout.syncpt);



	/* after CPU incr, ensure shadow is up to date */

	host1x_syncpt_load(cdma->timeout.syncpt);

drivers/gpu/host1x/hw/syncpt_hw.c

+5 −7
Original line number Diff line number Diff line
@@ -77,21 +77,19 @@ static u32 syncpt_load(struct host1x_syncpt *sp) 
 * Write a cpu syncpoint increment to the hardware, without touching

 * the cache.

 */

static void syncpt_cpu_incr(struct host1x_syncpt *sp)

static int syncpt_cpu_incr(struct host1x_syncpt *sp)

{

	struct host1x *host = sp->host;

	u32 reg_offset = sp->id / 32;



	if (!host1x_syncpt_client_managed(sp) &&

	    host1x_syncpt_idle(sp)) {

		dev_err(host->dev, "Trying to increment syncpoint id %d beyond max\n",

			sp->id);

		host1x_debug_dump(sp->host);

		return;

	}

	    host1x_syncpt_idle(sp))

		return -EINVAL;

	host1x_sync_writel(host, BIT_MASK(sp->id),

			   HOST1X_SYNC_SYNCPT_CPU_INCR(reg_offset));

	wmb();



	return 0;

}



/* remove a wait pointed to by patch_addr */

drivers/gpu/host1x/syncpt.c

+2 −13
Original line number Diff line number Diff line
@@ -128,23 +128,12 @@ u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp) 
	return val;

}



/*

 * Write a cpu syncpoint increment to the hardware, without touching

 * the cache. Caller is responsible for host being powered.

 */

void host1x_syncpt_cpu_incr(struct host1x_syncpt *sp)

{

	host1x_hw_syncpt_cpu_incr(sp->host, sp);

}



/*

 * Increment syncpoint value from cpu, updating cache

 */

void host1x_syncpt_incr(struct host1x_syncpt *sp)

int host1x_syncpt_incr(struct host1x_syncpt *sp)

{

	if (host1x_syncpt_client_managed(sp))

		host1x_syncpt_incr_max(sp, 1);

	host1x_syncpt_cpu_incr(sp);

	return host1x_hw_syncpt_cpu_incr(sp->host, sp);

}



/*