Patch "dma-buf/sw_sync: move timeline_fence_ops around" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
dma-buf/sw_sync: move timeline_fence_ops around
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
dma-buf-sw_sync-move-timeline_fence_ops-around.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
150b6a9d7d6fffb95c0a5349960a10569e8218b5Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <[email protected]>
Date: Sat, 29 Jul 2017 12:22:15 -0300
Subject: dma-buf/sw_sync: move timeline_fence_ops around
From: Gustavo Padovan <[email protected]>
commit 150b6a9d7d6fffb95c0a5349960a10569e8218b5 upstream.
We are going to use timeline_fence_signaled() in a internal function in the next commit.
--- drivers/dma-buf/sw_sync.c | 138 +++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-)
drivers/dma-buf/sw_sync.c +69 -69
@@ -125,6 +125,75 @@ static void sync_timeline_put(struct synkref_put (&obj->kref, sync_timeline_free); } +static const char *timeline_fence_get_driver_name (struct fence *fence) +{ +return "sw_sync" ; +} + +static const char *timeline_fence_get_timeline_name (struct fence *fence) +{ +struct sync_timeline *parent =fence_parent (fence); + +return parent->name; +} + +static void timeline_fence_release (struct fence *fence) +{ +struct sync_pt *pt =fence_to_sync_pt (fence); +struct sync_timeline *parent =fence_parent (fence); + +if (!list_empty (&pt->link)) { +unsigned long flags; + +spin_lock_irqsave (fence->lock, flags); +if (!list_empty (&pt->link)) { +list_del (&pt->link); +rb_erase (&pt->node, &parent->pt_tree); + } +spin_unlock_irqrestore (fence->lock, flags); + } + +sync_timeline_put (parent); +fence_free (fence); +} + +static bool timeline_fence_signaled (struct fence *fence) +{ +struct sync_timeline *parent =fence_parent (fence); + +return !__fence_is_later (fence->seqno, parent->value); +} + +static bool timeline_fence_enable_signaling (struct fence *fence) +{ +return true; +} + +static void timeline_fence_value_str (struct fence *fence, +char *str,int size) +{ +snprintf (str, size,"%d" , fence->seqno); +} + +static void timeline_fence_timeline_value_str (struct fence *fence, +char *str,int size) +{ +struct sync_timeline *parent =fence_parent (fence); + +snprintf (str, size,"%d" , parent->value); +} + +static const struct 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, + .signaled = timeline_fence_signaled, + .wait = fence_default_wait, + .release = timeline_fence_release, + .fence_value_str = timeline_fence_value_str, + .timeline_value_str = timeline_fence_timeline_value_str, +}; +/** * sync_timeline_signal() - signal a status change on a sync_timeline * @obj: sync_timeline to signal
@@ -216,75 +285,6 @@ unlock:return pt; } -static const char *timeline_fence_get_driver_name (struct fence *fence) -{ -return "sw_sync" ; -} - -static const char *timeline_fence_get_timeline_name (struct fence *fence) -{ -struct sync_timeline *parent =fence_parent (fence); - -return parent->name; -} - -static void timeline_fence_release (struct fence *fence) -{ -struct sync_pt *pt =fence_to_sync_pt (fence); -struct sync_timeline *parent =fence_parent (fence); - -if (!list_empty (&pt->link)) { -unsigned long flags; - -spin_lock_irqsave (fence->lock, flags); -if (!list_empty (&pt->link)) { -list_del (&pt->link); -rb_erase (&pt->node, &parent->pt_tree); - } -spin_unlock_irqrestore (fence->lock, flags); - } - -sync_timeline_put (parent); -fence_free (fence); -} - -static bool timeline_fence_signaled (struct fence *fence) -{ -struct sync_timeline *parent =fence_parent (fence); - -return !__fence_is_later (fence->seqno, parent->value); -} - -static bool timeline_fence_enable_signaling (struct fence *fence) -{ -return true; -} - -static void timeline_fence_value_str (struct fence *fence, -char *str,int size) -{ -snprintf (str, size,"%d" , fence->seqno); -} - -static void timeline_fence_timeline_value_str (struct fence *fence, -char *str,int size) -{ -struct sync_timeline *parent =fence_parent (fence); - -snprintf (str, size,"%d" , parent->value); -} - -static const struct 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, - .signaled = timeline_fence_signaled, - .wait = fence_default_wait, - .release = timeline_fence_release, - .fence_value_str = timeline_fence_value_str, - .timeline_value_str = timeline_fence_timeline_value_str, -}; -/* * *WARNING* *
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/dma-buf-sw-sync-fix-the-is-signaled-test-to-handle-u32-wraparound.patch queue-4.9/dma-buf-sw-sync-fix-locking-around-sync_timeline-lists.patch queue-4.9/dma-buf-sw_sync-clean-up-list-before-signaling-the-fence.patch queue-4.9/dma-buf-sw-sync-reduce-irqsave-irqrestore-from-known-context.patch queue-4.9/dma-buf-sw_sync-move-timeline_fence_ops-around.patch queue-4.9/dma-buf-sw-sync-prevent-user-overflow-on-timeline-advance.patch queue-4.9/dma-buf-sw_sync-force-signal-all-unsignaled-fences-on-dying-timeline.patch queue-4.9/dma-buf-sw-sync-use-an-rbtree-to-sort-fences-in-the-timeline.patch queue-4.9/dma-buf-sw-sync-sync_pt-is-private-and-of-fixed-size.patch queue-4.9/dma-buf-dma-fence-extract-__dma_fence_is_later.patch