diff options
| author | Arto Merilainen <amerilainen@nvidia.com> | 2013-05-29 10:26:08 (GMT) |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2013-06-22 10:43:55 (GMT) |
| commit | ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 (patch) | |
| tree | 9a483e8a9ad7b41ef69784afe1b106a6ec168bac /drivers/gpu/host1x/syncpt.c | |
| parent | ece66891ff452d5643ac5a61649f632984d83c10 (diff) | |
| download | linux-ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51.tar.xz | |
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: Arto Merilainen <amerilainen@nvidia.com>
Acked-By: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/gpu/host1x/syncpt.c')
| -rw-r--r-- | drivers/gpu/host1x/syncpt.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c index 27201b5..409745b 100644 --- a/drivers/gpu/host1x/syncpt.c +++ b/drivers/gpu/host1x/syncpt.c @@ -129,22 +129,11 @@ u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp) } /* - * 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); } /* |