malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "CHROMIUM: dma-buf: dma-fence: fix warning when releasing

Browse Source 
active sync point"

This reverts commit df9d8c41ac73d51e7a3be1aacd4283467388701e.

The warning fixed by the above commit is no more present in
kernel.

Change-Id: I1fa1dd69a033b13b92c4f99d5afbc881d848d645
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
This commit is contained in:
Vinayak Menon 2019-01-02 21:52:16 +05:30 committed by Gerrit - the friendly Code Review server
parent 30af045f6b
commit 548b285f7a
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma-buf/dma-fence.c
View File

@ -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);

8
drivers/dma-buf/sw_sync.c
View File

@ -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,

2
include/linux/dma-fence.h
View File

@ -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);