staging/android: store last signaled value on sync timeline

Now fence timeline is aware of the last signaled fence, as it
receives the increment to the current value in sync_timeline_signal().

That allow us to remove .has_signaled() from timeline_ops as we can
directly compare using timeline->value and fence->seqno in sync.c

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index af39ff58fa33134ad17b2a19294a30d0615bbe26..428e22c998c524a0e6629626bfe259dd7594d559 100644 (file)
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -30,7 +30,7 @@ struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value)
        struct sw_sync_pt *pt;
 
        pt = (struct sw_sync_pt *)
-               sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt));
+               sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt), value);
 
        pt->value = value;
 
@@ -38,15 +38,6 @@ struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value)
 }
 EXPORT_SYMBOL(sw_sync_pt_create);
 
-static int sw_sync_fence_has_signaled(struct fence *fence)
-{
-       struct sw_sync_pt *pt = (struct sw_sync_pt *)fence;
-       struct sw_sync_timeline *obj =
-               (struct sw_sync_timeline *)fence_parent(fence);
-
-       return (pt->value > obj->value) ? 0 : 1;
-}
-
 static void sw_sync_timeline_value_str(struct sync_timeline *sync_timeline,
                                       char *str, int size)
 {
@@ -64,7 +55,6 @@ static void sw_sync_fence_value_str(struct fence *fence, char *str, int size)
 
 static struct sync_timeline_ops sw_sync_timeline_ops = {
        .driver_name = "sw_sync",
-       .has_signaled = sw_sync_fence_has_signaled,
        .timeline_value_str = sw_sync_timeline_value_str,
        .fence_value_str = sw_sync_fence_value_str,
 };
@@ -82,8 +72,6 @@ EXPORT_SYMBOL(sw_sync_timeline_create);
 
 void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc)
 {
-       obj->value += inc;
-
-       sync_timeline_signal(&obj->obj);
+       sync_timeline_signal(&obj->obj, inc);
 }
 EXPORT_SYMBOL(sw_sync_timeline_inc);

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 1d14c83c7f7c95effe5a173471e1a4e238351db2..8dd2181afea859adf5bda0eea3292ff1b95841e6 100644 (file)
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -90,7 +90,7 @@ void sync_timeline_destroy(struct sync_timeline *obj)
 }
 EXPORT_SYMBOL(sync_timeline_destroy);
 
-void sync_timeline_signal(struct sync_timeline *obj)
+void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc)
 {
        unsigned long flags;
        struct fence *fence, *next;
@@ -99,6 +99,8 @@ void sync_timeline_signal(struct sync_timeline *obj)
 
        spin_lock_irqsave(&obj->child_list_lock, flags);
 
+       obj->value += inc;
+
        list_for_each_entry_safe(fence, next, &obj->active_list_head,
                                 active_list) {
                if (fence_is_signaled_locked(fence))
@@ -109,7 +111,8 @@ void sync_timeline_signal(struct sync_timeline *obj)
 }
 EXPORT_SYMBOL(sync_timeline_signal);
 
-struct fence *sync_pt_create(struct sync_timeline *obj, int size)
+struct fence *sync_pt_create(struct sync_timeline *obj, int size,
+                            unsigned int value)
 {
        unsigned long flags;
        struct fence *fence;
@@ -124,7 +127,7 @@ struct fence *sync_pt_create(struct sync_timeline *obj, int size)
        spin_lock_irqsave(&obj->child_list_lock, flags);
        sync_timeline_get(obj);
        fence_init(fence, &android_fence_ops, &obj->child_list_lock,
-                  obj->context, ++obj->value);
+                  obj->context, value);
        list_add_tail(&fence->child_list, &obj->child_list_head);
        INIT_LIST_HEAD(&fence->active_list);
        spin_unlock_irqrestore(&obj->child_list_lock, flags);
@@ -164,12 +167,8 @@ static void android_fence_release(struct fence *fence)
 static bool android_fence_signaled(struct fence *fence)
 {
        struct sync_timeline *parent = fence_parent(fence);
-       int ret;
 
-       ret = parent->ops->has_signaled(fence);
-       if (ret < 0)
-               fence->status = ret;
-       return ret;
+       return (fence->seqno > parent->value) ? false : true;
 }
 
 static bool android_fence_enable_signaling(struct fence *fence)

diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index b56885c148396a845e62464d38aed2d6832f6625..627525c223fb92328d417428c95d7135a78a558e 100644 (file)
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -28,19 +28,12 @@ struct sync_timeline;
 /**
  * struct sync_timeline_ops - sync object implementation ops
  * @driver_name:       name of the implementation
- * @has_signaled:      returns:
- *                       1 if pt has signaled
- *                       0 if pt has not signaled
- *                      <0 on error
  * @timeline_value_str: fill str with the value of the sync_timeline's counter
  * @fence_value_str:   fill str with the value of the fence
  */
 struct sync_timeline_ops {
        const char *driver_name;
 
-       /* required */
-       int (*has_signaled)(struct fence *fence);
-
        /* optional */
        void (*timeline_value_str)(struct sync_timeline *timeline, char *str,
                                   int size);
@@ -117,23 +110,26 @@ void sync_timeline_destroy(struct sync_timeline *obj);
 /**
  * sync_timeline_signal() - signal a status change on a sync_timeline
  * @obj:       sync_timeline to signal
+ * @inc:       num to increment on timeline->value
  *
  * A sync implementation should call this any time one of it's fences
  * has signaled or has an error condition.
  */
-void sync_timeline_signal(struct sync_timeline *obj);
+void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc);
 
 /**
  * sync_pt_create() - creates a sync pt
  * @parent:    fence's parent sync_timeline
  * @size:      size to allocate for this pt
+ * @inc:       value of the fence
  *
  * Creates a new fence as a child of @parent.  @size bytes will be
  * allocated allowing for implementation specific data to be kept after
  * the generic sync_timeline struct. Returns the fence object or
  * NULL in case of error.
  */
-struct fence *sync_pt_create(struct sync_timeline *parent, int size);
+struct fence *sync_pt_create(struct sync_timeline *parent, int size,
+                            unsigned int inc);
 
 #ifdef CONFIG_DEBUG_FS