Commit 51f170a5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Revert 190c462d..bf3012ad" 



I shouldn't have pushed this, CI was right - I failed to remove the
BUG_ON(!ops->wait);

Reported-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent bf3012ad

drivers/dma-buf/dma-fence-array.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ const struct dma_fence_ops dma_fence_array_ops = { 
	.get_timeline_name = dma_fence_array_get_timeline_name,

	.enable_signaling = dma_fence_array_enable_signaling,

	.signaled = dma_fence_array_signaled,

	.wait = dma_fence_default_wait,

	.release = dma_fence_array_release,

};

EXPORT_SYMBOL(dma_fence_array_ops);

drivers/dma-buf/dma-fence.c

+7 −16
Original line number Diff line number Diff line
@@ -158,10 +158,7 @@ dma_fence_wait_timeout(struct dma_fence *fence, bool intr, signed long timeout) 
		return -EINVAL;



	trace_dma_fence_wait_start(fence);

	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;

}
@@ -184,13 +181,6 @@ 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);
@@ -506,6 +496,11 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, 
	for (i = 0; i < count; ++i) {

		struct dma_fence *fence = fences[i];



		if (fence->ops->wait != dma_fence_default_wait) {

			ret = -EINVAL;

			goto fence_rm_cb;

		}



		cb[i].task = current;

		if (dma_fence_add_callback(fence, &cb[i].base,

					   dma_fence_default_wait_cb)) {
@@ -565,7 +560,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 ||

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

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



	kref_init(&fence->refcount);
@@ -577,10 +572,6 @@ 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);

drivers/dma-buf/sw_sync.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static const struct dma_fence_ops timeline_fence_ops = { 
	.get_timeline_name = timeline_fence_get_timeline_name,

	.enable_signaling = timeline_fence_enable_signaling,

	.signaled = timeline_fence_signaled,

	.wait = dma_fence_default_wait,

	.release = timeline_fence_release,

	.fence_value_str = timeline_fence_value_str,

	.timeline_value_str = timeline_fence_timeline_value_str,

drivers/gpu/drm/drm_crtc.c

+7 −0
Original line number Diff line number Diff line
@@ -225,9 +225,16 @@ static const char *drm_crtc_fence_get_timeline_name(struct dma_fence *fence) 
	return crtc->timeline_name;

}



static bool drm_crtc_fence_enable_signaling(struct dma_fence *fence)

{

	return true;

}



static const struct dma_fence_ops drm_crtc_fence_ops = {

	.get_driver_name = drm_crtc_fence_get_driver_name,

	.get_timeline_name = drm_crtc_fence_get_timeline_name,

	.enable_signaling = drm_crtc_fence_enable_signaling,

	.wait = dma_fence_default_wait,

};



struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc)

drivers/gpu/drm/drm_syncobj.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static const struct dma_fence_ops drm_syncobj_null_fence_ops = { 
	.get_driver_name = drm_syncobj_null_fence_get_name,

	.get_timeline_name = drm_syncobj_null_fence_get_name,

	.enable_signaling = drm_syncobj_null_fence_enable_signaling,

	.wait = dma_fence_default_wait,

	.release = NULL,

};