diff options
| author | Arto Merilainen | 2013-05-29 12:26:08 +0200 |
|---|---|---|
| committer | Thierry Reding | 2013-06-22 12:43:55 +0200 |
| commit | ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 (patch) | |
| tree | 9a483e8a9ad7b41ef69784afe1b106a6ec168bac /drivers/gpu/host1x/syncpt.h | |
| parent | gpu: host1x: Fix client_managed type (diff) | |
| download | kernel-qcow2-linux-ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51.tar.gz kernel-qcow2-linux-ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51.tar.xz kernel-qcow2-linux-ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51.zip | |
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.h')
| -rw-r--r-- | drivers/gpu/host1x/syncpt.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/host1x/syncpt.h b/drivers/gpu/host1x/syncpt.h index d00e758352eb..267c0b9d3647 100644 --- a/drivers/gpu/host1x/syncpt.h +++ b/drivers/gpu/host1x/syncpt.h @@ -115,9 +115,6 @@ static inline bool host1x_syncpt_idle(struct host1x_syncpt *sp) /* Return pointer to struct denoting sync point id. */ struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, u32 id); -/* Request incrementing a sync point. */ -void host1x_syncpt_cpu_incr(struct host1x_syncpt *sp); - /* Load current value from hardware to the shadow register. */ u32 host1x_syncpt_load(struct host1x_syncpt *sp); @@ -133,8 +130,8 @@ void host1x_syncpt_restore(struct host1x *host); /* Read current wait base value into shadow register and return it. */ u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp); -/* Increment sync point and its max. */ -void host1x_syncpt_incr(struct host1x_syncpt *sp); +/* Request incrementing a sync point. */ +int host1x_syncpt_incr(struct host1x_syncpt *sp); /* Indicate future operations by incrementing the sync point max. */ u32 host1x_syncpt_incr_max(struct host1x_syncpt *sp, u32 incrs); |