From: Gustavo Padovan <gustavo@padovan.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, daniels@collabora.com, "Arve Hjønnevåg" <arve@android.com>, "Riley Andrews" <riandrews@android.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Rob Clark" <robdclark@gmail.com>, "Greg Hackmann" <ghackmann@google.com>, "John Harrison" <John.C.Harrison@Intel.com>, "Maarten Lankhorst" <maarten.lankhorst@canonical.com>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk> Subject: [RFC 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Date: Fri, 15 Jan 2016 12:55:20 -0200 [thread overview] Message-ID: <1452869739-3304-11-git-send-email-gustavo@padovan.org> (raw) In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> 'sync_pt' is actually declared as struct fence so to make the name means its type we rename it to 'fence'. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> --- drivers/staging/android/sync.c | 20 ++++++++++---------- drivers/staging/android/sync.h | 2 +- drivers/staging/android/sync_debug.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c47b68d..decff9e 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -197,7 +197,7 @@ struct sync_fence *sync_fence_create_dma(const char *name, struct fence *pt) sync_fence->num_fences = 1; atomic_set(&sync_fence->status, 1); - sync_fence->cbs[0].sync_pt = pt; + sync_fence->cbs[0].fence = pt; sync_fence->cbs[0].sync_fence = sync_fence; if (fence_add_callback(pt, &sync_fence->cbs[0].cb, fence_check_cb_func)) atomic_dec(&sync_fence->status); @@ -247,7 +247,7 @@ EXPORT_SYMBOL(sync_fence_install); static void sync_fence_add_pt(struct sync_fence *sync_fence, int *i, struct fence *pt) { - sync_fence->cbs[*i].sync_pt = pt; + sync_fence->cbs[*i].fence = pt; sync_fence->cbs[*i].sync_fence = sync_fence; if (!fence_add_callback(pt, &sync_fence->cbs[*i].cb, @@ -279,8 +279,8 @@ struct sync_fence *sync_fence_merge(const char *name, * and sync_fence_create, this is a reasonable assumption. */ for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) { - struct fence *pt_a = a->cbs[i_a].sync_pt; - struct fence *pt_b = b->cbs[i_b].sync_pt; + struct fence *pt_a = a->cbs[i_a].fence; + struct fence *pt_b = b->cbs[i_b].fence; if (pt_a->context < pt_b->context) { sync_fence_add_pt(sync_fence, &i, pt_a); @@ -302,10 +302,10 @@ struct sync_fence *sync_fence_merge(const char *name, } for (; i_a < a->num_fences; i_a++) - sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].sync_pt); + sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].fence); for (; i_b < b->num_fences; i_b++) - sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].sync_pt); + sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].fence); if (num_fences > i) atomic_sub(num_fences - i, &sync_fence->status); @@ -384,7 +384,7 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) trace_sync_wait(sync_fence, 1); for (i = 0; i < sync_fence->num_fences; ++i) - trace_sync_pt(sync_fence->cbs[i].sync_pt); + trace_sync_pt(sync_fence->cbs[i].fence); ret = wait_event_interruptible_timeout(sync_fence->wq, atomic_read(&sync_fence->status) <= 0, timeout); @@ -525,9 +525,9 @@ static void sync_fence_free(struct kref *kref) int i; for (i = 0; i < sync_fence->num_fences; ++i) { - fence_remove_callback(sync_fence->cbs[i].sync_pt, + fence_remove_callback(sync_fence->cbs[i].fence, &sync_fence->cbs[i].cb); - fence_put(sync_fence->cbs[i].sync_pt); + fence_put(sync_fence->cbs[i].fence); } kfree(sync_fence); @@ -681,7 +681,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence *sync_fence, len = sizeof(struct sync_fence_info_data); for (i = 0; i < sync_fence->num_fences; ++i) { - struct fence *pt = sync_fence->cbs[i].sync_pt; + struct fence *pt = sync_fence->cbs[i].fence; ret = sync_fill_pt_info(pt, (u8 *)data + len, size - len); diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index 0fed642..43f72a7 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -110,7 +110,7 @@ static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) struct sync_fence_cb { struct fence_cb cb; - struct fence *sync_pt; + struct fence *fence; struct sync_fence *sync_fence; }; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index cfa92d2..78e9147 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -163,7 +163,7 @@ static void sync_print_sync_fence(struct seq_file *s, sync_status_str(atomic_read(&sync_fence->status))); for (i = 0; i < sync_fence->num_fences; ++i) { - sync_print_pt(s, sync_fence->cbs[i].sync_pt, true); + sync_print_pt(s, sync_fence->cbs[i].fence, true); } spin_lock_irqsave(&sync_fence->wq.lock, flags); -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Gustavo Padovan <gustavo@padovan.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: devel@driverdev.osuosl.org, daniels@collabora.com, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Riley Andrews" <riandrews@android.com>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Arve Hjønnevåg" <arve@android.com>, "Maarten Lankhorst" <maarten.lankhorst@canonical.com>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk>, "John Harrison" <John.C.Harrison@Intel.com> Subject: [RFC 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Date: Fri, 15 Jan 2016 12:55:20 -0200 [thread overview] Message-ID: <1452869739-3304-11-git-send-email-gustavo@padovan.org> (raw) In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> 'sync_pt' is actually declared as struct fence so to make the name means its type we rename it to 'fence'. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> --- drivers/staging/android/sync.c | 20 ++++++++++---------- drivers/staging/android/sync.h | 2 +- drivers/staging/android/sync_debug.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c47b68d..decff9e 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -197,7 +197,7 @@ struct sync_fence *sync_fence_create_dma(const char *name, struct fence *pt) sync_fence->num_fences = 1; atomic_set(&sync_fence->status, 1); - sync_fence->cbs[0].sync_pt = pt; + sync_fence->cbs[0].fence = pt; sync_fence->cbs[0].sync_fence = sync_fence; if (fence_add_callback(pt, &sync_fence->cbs[0].cb, fence_check_cb_func)) atomic_dec(&sync_fence->status); @@ -247,7 +247,7 @@ EXPORT_SYMBOL(sync_fence_install); static void sync_fence_add_pt(struct sync_fence *sync_fence, int *i, struct fence *pt) { - sync_fence->cbs[*i].sync_pt = pt; + sync_fence->cbs[*i].fence = pt; sync_fence->cbs[*i].sync_fence = sync_fence; if (!fence_add_callback(pt, &sync_fence->cbs[*i].cb, @@ -279,8 +279,8 @@ struct sync_fence *sync_fence_merge(const char *name, * and sync_fence_create, this is a reasonable assumption. */ for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) { - struct fence *pt_a = a->cbs[i_a].sync_pt; - struct fence *pt_b = b->cbs[i_b].sync_pt; + struct fence *pt_a = a->cbs[i_a].fence; + struct fence *pt_b = b->cbs[i_b].fence; if (pt_a->context < pt_b->context) { sync_fence_add_pt(sync_fence, &i, pt_a); @@ -302,10 +302,10 @@ struct sync_fence *sync_fence_merge(const char *name, } for (; i_a < a->num_fences; i_a++) - sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].sync_pt); + sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].fence); for (; i_b < b->num_fences; i_b++) - sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].sync_pt); + sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].fence); if (num_fences > i) atomic_sub(num_fences - i, &sync_fence->status); @@ -384,7 +384,7 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) trace_sync_wait(sync_fence, 1); for (i = 0; i < sync_fence->num_fences; ++i) - trace_sync_pt(sync_fence->cbs[i].sync_pt); + trace_sync_pt(sync_fence->cbs[i].fence); ret = wait_event_interruptible_timeout(sync_fence->wq, atomic_read(&sync_fence->status) <= 0, timeout); @@ -525,9 +525,9 @@ static void sync_fence_free(struct kref *kref) int i; for (i = 0; i < sync_fence->num_fences; ++i) { - fence_remove_callback(sync_fence->cbs[i].sync_pt, + fence_remove_callback(sync_fence->cbs[i].fence, &sync_fence->cbs[i].cb); - fence_put(sync_fence->cbs[i].sync_pt); + fence_put(sync_fence->cbs[i].fence); } kfree(sync_fence); @@ -681,7 +681,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence *sync_fence, len = sizeof(struct sync_fence_info_data); for (i = 0; i < sync_fence->num_fences; ++i) { - struct fence *pt = sync_fence->cbs[i].sync_pt; + struct fence *pt = sync_fence->cbs[i].fence; ret = sync_fill_pt_info(pt, (u8 *)data + len, size - len); diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index 0fed642..43f72a7 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -110,7 +110,7 @@ static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) struct sync_fence_cb { struct fence_cb cb; - struct fence *sync_pt; + struct fence *fence; struct sync_fence *sync_fence; }; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index cfa92d2..78e9147 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -163,7 +163,7 @@ static void sync_print_sync_fence(struct seq_file *s, sync_status_str(atomic_read(&sync_fence->status))); for (i = 0; i < sync_fence->num_fences; ++i) { - sync_print_pt(s, sync_fence->cbs[i].sync_pt, true); + sync_print_pt(s, sync_fence->cbs[i].fence, true); } spin_lock_irqsave(&sync_fence->wq.lock, flags); -- 2.5.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-01-15 14:56 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-15 14:55 [RFC 00/29] De-stage android's sync framework Gustavo Padovan 2016-01-15 14:55 ` [RFC 01/29] staging/android: fix sync framework documentation Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 02/29] staging/android: fix checkpatch warning Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 03/29] staging/android: rename sync_fence_release Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 04/29] staging/android: rename 'android_fence' to 'sync_fence' Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 05/29] staging/android: remove not used sync_timeline ops Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 06/29] staging/android: create a 'sync' dir for debugfs information Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 07/29] staging/android: move sw_sync file to debugfs file Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 08/29] staging/android: Remove WARN_ON_ONCE when releasing sync_fence Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 09/29] staging/android: rename struct sync_fence's variables to 'sync_fence' Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan [this message] 2016-01-15 14:55 ` [RFC 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Gustavo Padovan 2016-01-15 14:55 ` [RFC 11/29] dma-buf/fence: move sync_timeline to fence_timeline Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-20 0:56 ` Greg Hackmann 2016-01-20 0:56 ` Greg Hackmann 2016-01-15 14:55 ` [RFC 12/29] staging/android: remove struct sync_pt Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 13/29] dma-buf/fence: create fence_default_enable_signaling() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 14/29] dma-buf/fence: create fence_default_release() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 15/29] dma-buf/fence: create fence_default_get_driver_name() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 16/29] dma-buf/fence: create fence_default_timeline_name() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 17/29] dma-buf/fence: store last signaled value on fence timeline Gustavo Padovan 2016-01-15 14:55 ` [RFC 18/29] dma-buf/fence: create default .fence_value_str() and .timeline_value_str() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 19/29] dma-buf/fence: create fence_default_fill_driver_data() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 20/29] dma-buf/fence: remove fence_timeline_ops Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 21/29] dma-buf/fence: add fence_create_on_timeline() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 22/29] staging/android: remove sync_pt_create() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 23/29] staging/android: remove sw_sync_timeline and sw_sync_pt Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 24/29] dma-buf/fence: add debug to fence timeline Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 25/29] dma-buf/fence: remove unused var from fence_timeline_signal() Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 26/29] dma-buf/fence: remove pointless fence_timeline_signal at destroy phase Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 17:48 ` John Harrison 2016-01-15 18:02 ` Gustavo Padovan 2016-01-15 23:42 ` Greg Hackmann 2016-01-15 23:42 ` Greg Hackmann 2016-02-09 22:55 ` Tom Cherry 2016-02-09 22:55 ` Tom Cherry 2016-02-25 15:26 ` Gustavo Padovan 2016-02-25 15:26 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 27/29] dma-buf/fence: add .cleanup() callback Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 28/29] staging/android: use .cleanup() to interrupt any sync_fence waiter Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 14:55 ` [RFC 29/29] dma-buf/fence: de-stage sync framework Gustavo Padovan 2016-01-15 14:55 ` Gustavo Padovan 2016-01-15 19:11 ` [RFC 00/29] De-stage android's " Joe Perches 2016-01-19 11:00 ` Daniel Vetter 2016-01-19 11:00 ` Daniel Vetter 2016-01-19 15:23 ` Gustavo Padovan 2016-01-19 15:23 ` Gustavo Padovan 2016-01-19 16:12 ` John Harrison 2016-01-19 17:52 ` Gustavo Padovan 2016-01-19 17:52 ` Gustavo Padovan 2016-01-19 18:04 ` Daniel Vetter 2016-01-19 18:04 ` Daniel Vetter 2016-01-19 18:15 ` Gustavo Padovan 2016-03-23 15:07 ` Tomeu Vizoso 2016-03-23 15:07 ` Tomeu Vizoso 2016-01-19 20:10 ` Gustavo Padovan 2016-01-19 20:10 ` Gustavo Padovan 2016-01-19 20:32 ` Daniel Vetter 2016-01-19 20:32 ` Daniel Vetter 2016-01-20 10:28 ` Maarten Lankhorst 2016-01-20 14:32 ` Gustavo Padovan 2016-01-20 14:32 ` Gustavo Padovan 2016-01-20 15:02 ` Maarten Lankhorst 2016-01-20 15:02 ` Maarten Lankhorst 2016-01-20 16:29 ` Daniel Vetter 2016-01-20 16:29 ` Daniel Vetter 2016-01-20 18:28 ` Gustavo Padovan 2016-01-20 18:28 ` Gustavo Padovan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1452869739-3304-11-git-send-email-gustavo@padovan.org \ --to=gustavo@padovan.org \ --cc=John.C.Harrison@Intel.com \ --cc=arve@android.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniels@collabora.com \ --cc=devel@driverdev.osuosl.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=ghackmann@google.com \ --cc=gregkh@linuxfoundation.org \ --cc=gustavo.padovan@collabora.co.uk \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@canonical.com \ --cc=riandrews@android.com \ --cc=robdclark@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.