Commit 184b58fa authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding
Browse files

gpu: host1x: Always return syncpoint value when waiting 



The new TegraDRM UAPI uses syncpoint waiting with timeout set to
zero to indicate reading the syncpoint value. To support that we
need to return the syncpoint value always when waiting.

Fixes: 44e96138 ("drm/tegra: Implement syncpoint wait UAPI")
Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 22d7ee32

drivers/gpu/host1x/syncpt.c

+2 −17
Original line number Diff line number Diff line
@@ -234,27 +234,12 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout, 
	void *ref;

	struct host1x_waitlist *waiter;

	int err = 0, check_count = 0;

	u32 val;



	if (value)

		*value = 0;



	/* first check cache */

	if (host1x_syncpt_is_expired(sp, thresh)) {

	if (value)

		*value = host1x_syncpt_load(sp);



	if (host1x_syncpt_is_expired(sp, thresh))

		return 0;

	}



	/* try to read from register */

	val = host1x_hw_syncpt_load(sp->host, sp);

	if (host1x_syncpt_is_expired(sp, thresh)) {

		if (value)

			*value = val;



		goto done;

	}



	if (!timeout) {

		err = -EAGAIN;