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>

2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c
index 590b69d91dab..2ee4ad55c4db 100644
--- a/drivers/gpu/host1x/hw/cdma_hw.c
+++ b/drivers/gpu/host1x/hw/cdma_hw.c
@@ -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);
diff --git a/drivers/gpu/host1x/hw/syncpt_hw.c b/drivers/gpu/host1x/hw/syncpt_hw.c
index 61174990102a..0cf6095d3367 100644
--- a/drivers/gpu/host1x/hw/syncpt_hw.c
+++ b/drivers/gpu/host1x/hw/syncpt_hw.c
@@ -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 */