Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ed01ea authored by Daniel Vetter's avatar Daniel Vetter
Browse files

dma-fence: Make ->enable_signaling optional 



Many drivers have a trivial implementation for ->enable_signaling.
Let's make it optional by assuming that signalling is already
available when the callback isn't present.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
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
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180427061724.28497-4-daniel.vetter@ffwll.ch
parent aee1a37d

drivers/dma-buf/dma-fence.c

+12 −1
Original line number Diff line number Diff line
@@ -181,6 +181,13 @@ void dma_fence_release(struct kref *kref) 
}

EXPORT_SYMBOL(dma_fence_release);



/**

 * dma_fence_free - default release function for &dma_fence.

 * @fence: fence to release

 *

 * This is the default implementation for &dma_fence_ops.release. It calls

 * kfree_rcu() on @fence.

 */

void dma_fence_free(struct dma_fence *fence)

{

	kfree_rcu(fence, rcu);
@@ -560,7 +567,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->enable_signaling ||

	BUG_ON(!ops || !ops->wait ||

	       !ops->get_driver_name || !ops->get_timeline_name);



	kref_init(&fence->refcount);
@@ -572,6 +579,10 @@ dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops, 
	fence->flags = 0UL;

	fence->error = 0;



	if (!ops->enable_signaling)

		set_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,

			&fence->flags);



	trace_dma_fence_init(fence);

}

EXPORT_SYMBOL(dma_fence_init);

include/linux/dma-fence.h

+2 −1
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ struct dma_fence_ops { 
	 * released when the fence is signalled (through e.g. the interrupt

	 * handler).

	 *

	 * This callback is mandatory.

	 * This callback is optional. If this callback is not present, then the

	 * driver must always have signaling enabled.

	 */

	bool (*enable_signaling)(struct dma_fence *fence);