From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> ... Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> --- drivers/dma-buf/dma-fence.c | 9 +++++---- include/linux/dma-fence.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index bdba5a8e21b1..5607acdb6ccf 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -656,8 +656,8 @@ void dma_fence_enable_sw_signaling(struct dma_fence *fence) } EXPORT_SYMBOL(dma_fence_enable_sw_signaling); -static int add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, - dma_fence_func_t func, bool wait) +int __dma_fence_add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, + dma_fence_func_t func, bool wait) { unsigned long flags; int ret = 0; @@ -686,6 +686,7 @@ static int add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, return ret; } +EXPORT_SYMBOL(__dma_fence_add_callback); /** * dma_fence_add_callback - add a callback to be called when the fence @@ -712,7 +713,7 @@ static int add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, int dma_fence_add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, dma_fence_func_t func) { - return add_callback(fence, cb, func, false); + return __dma_fence_add_callback(fence, cb, func, false); } EXPORT_SYMBOL(dma_fence_add_callback); @@ -720,7 +721,7 @@ int dma_fence_add_wait_callback(struct dma_fence *fence, struct dma_fence_cb *cb, dma_fence_func_t func) { - return add_callback(fence, cb, func, true); + return __dma_fence_add_callback(fence, cb, func, true); } EXPORT_SYMBOL(dma_fence_add_wait_callback); diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index 2b696f9de276..1f41d60ce6f7 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -384,6 +384,9 @@ int dma_fence_signal_timestamp_locked(struct dma_fence *fence, ktime_t timestamp); signed long dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout); +int __dma_fence_add_callback(struct dma_fence *fence, + struct dma_fence_cb *cb, + dma_fence_func_t func, bool wait); int dma_fence_add_callback(struct dma_fence *fence, struct dma_fence_cb *cb, dma_fence_func_t func); -- 2.37.2