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

Commit 5e78a797 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "CHROMIUM: dma-buf: dma-fence: fix warning when releasing active sync point""

parents e4df53f3 548b285f

drivers/dma-buf/dma-fence.c

+1 −5
Original line number Diff line number Diff line
@@ -329,12 +329,8 @@ dma_fence_remove_callback(struct dma_fence *fence, struct dma_fence_cb *cb) 
	spin_lock_irqsave(fence->lock, flags);



	ret = !list_empty(&cb->node);

	if (ret) {

	if (ret)

		list_del_init(&cb->node);

		if (list_empty(&fence->cb_list))

			if (fence->ops->disable_signaling)

				fence->ops->disable_signaling(fence);

	}



	spin_unlock_irqrestore(fence->lock, flags);

drivers/dma-buf/sw_sync.c

+0 −8
Original line number Diff line number Diff line
@@ -169,13 +169,6 @@ static bool timeline_fence_enable_signaling(struct dma_fence *fence) 
	return true;

}



static void timeline_fence_disable_signaling(struct dma_fence *fence)

{

	struct sync_pt *pt = dma_fence_to_sync_pt(fence);



	list_del_init(&pt->link);

}



static void timeline_fence_value_str(struct dma_fence *fence,

				    char *str, int size)

{
@@ -194,7 +187,6 @@ static const struct dma_fence_ops timeline_fence_ops = { 
	.get_driver_name = timeline_fence_get_driver_name,

	.get_timeline_name = timeline_fence_get_timeline_name,

	.enable_signaling = timeline_fence_enable_signaling,

	.disable_signaling = timeline_fence_disable_signaling,

	.signaled = timeline_fence_signaled,

	.wait = dma_fence_default_wait,

	.release = timeline_fence_release,

include/linux/dma-fence.h

+0 −2
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ struct dma_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 dma_fence_default_wait.

 * @release: [optional] called on destruction of fence, can be null
@@ -171,7 +170,6 @@ struct dma_fence_ops { 
	const char * (*get_driver_name)(struct dma_fence *fence);

	const char * (*get_timeline_name)(struct dma_fence *fence);

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

	void (*disable_signaling)(struct dma_fence *fence);

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

	signed long (*wait)(struct dma_fence *fence,

			    bool intr, signed long timeout);