dma-fence: Make ->wait callback optional

Almost everyone uses dma_fence_default_wait.

v2: Also remove the BUG_ON(!ops->wait) (Chris).

Reviewed-by: Christian König <christian.koenig@amd.com> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Link: https://patchwork.freedesktop.org/patch/msgid/20180503142603.28513-5-daniel.vetter@ffwll.ch

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index ea343f992112..7a92f85a4cec 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -158,7 +158,10 @@ dma_fence_wait_timeout(struct dma_fence *fence, bool intr, signed long timeout)
                 return -EINVAL;
 
         trace_dma_fence_wait_start(fence);
-        ret = fence->ops->wait(fence, intr, timeout);
+        if (fence->ops->wait)
+                ret = fence->ops->wait(fence, intr, timeout);
+        else
+                ret = dma_fence_default_wait(fence, intr, timeout);
         trace_dma_fence_wait_end(fence);
         return ret;
 }
@@ -556,8 +559,7 @@ dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops,
                spinlock_t *lock, u64 context, unsigned seqno)
 {
         BUG_ON(!lock);
-        BUG_ON(!ops || !ops->wait ||
-               !ops->get_driver_name || !ops->get_timeline_name);
+        BUG_ON(!ops || !ops->get_driver_name || !ops->get_timeline_name);
 
         kref_init(&fence->refcount);
         fence->ops = ops;