Merge remote-tracking branch 'lsk/linux-linaro-lsk-v4.4-android' into linux-linaro...

[firefly-linux-kernel-4.4.55.git] / include / linux / fence.h

diff --git a/include/linux/fence.h b/include/linux/fence.h
index bb522011383bca52ba248110a2a4c1e86d1f5aa3..ce4434814b8bce38d05f88e00675d9577359c166 100644 (file)
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
@@ -107,6 +107,7 @@ struct fence_cb {
  * @get_driver_name: returns the driver name.
  * @get_timeline_name: return the name of the context this fence belongs to.
  * @enable_signaling: enable software signaling of fence.
+ * @disable_signaling: disable software signaling of fence (optional).
  * @signaled: [optional] peek whether the fence is signaled, can be null.
  * @wait: custom wait implementation, or fence_default_wait.
  * @release: [optional] called on destruction of fence, can be null
@@ -166,6 +167,7 @@ struct fence_ops {
        const char * (*get_driver_name)(struct fence *fence);
        const char * (*get_timeline_name)(struct fence *fence);
        bool (*enable_signaling)(struct fence *fence);
+       void (*disable_signaling)(struct fence *fence);
        bool (*signaled)(struct fence *fence);
        signed long (*wait)(struct fence *fence, bool intr, signed long timeout);
        void (*release)(struct fence *fence);