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,
"Daniel Stone" <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@linux.intel.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [PATCH v2 03/13] staging/android: move sync_file functions comments to sync.c
Date: Thu, 28 Apr 2016 10:46:50 -0300 [thread overview]
Message-ID: <1461851220-1583-4-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1461851220-1583-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
To keep comments in line with drivers/dma-buf/ move all sync_file comments
to sync.c.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/staging/android/sync.c | 26 +++++++++++++++++++++++++-
drivers/staging/android/sync.h | 31 -------------------------------
2 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index b965e2a..a89ded0 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -173,7 +173,14 @@ static void fence_check_cb_func(struct fence *f, struct fence_cb *cb)
wake_up_all(&sync_file->wq);
}
-/* TODO: implement a create which takes more that one fence */
+/**
+ * sync_fence_create() - creates a sync fence
+ * @name: name of fence to create
+ * @fence: fence to add to the sync_fence
+ *
+ * Creates a sync_file containg @fence. Once this is called, the sync_file
+ * takes ownership of @fence.
+ */
struct sync_file *sync_file_create(const char *name, struct fence *fence)
{
struct sync_file *sync_file;
@@ -198,6 +205,13 @@ struct sync_file *sync_file_create(const char *name, struct fence *fence)
}
EXPORT_SYMBOL(sync_file_create);
+/**
+ * sync_file_fdget() - get a sync_file from an fd
+ * @fd: fd referencing a fence
+ *
+ * Ensures @fd references a valid sync_file, increments the refcount of the
+ * backing file. Returns the sync_file or NULL in case of error.
+ */
struct sync_file *sync_file_fdget(int fd)
{
struct file *file = fget(fd);
@@ -229,6 +243,16 @@ static void sync_file_add_pt(struct sync_file *sync_file, int *i,
}
}
+/**
+ * sync_file_merge() - merge two sync_files
+ * @name: name of new fence
+ * @a: sync_file a
+ * @b: sync_file b
+ *
+ * Creates a new sync_file which contains copies of all the fences in both
+ * @a and @b. @a and @b remain valid, independent sync_file. Returns the
+ * new merged sync_file or NULL in case of error.
+ */
struct sync_file *sync_file_merge(const char *name,
struct sync_file *a, struct sync_file *b)
{
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index c45cc7b..925fba5 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -167,40 +167,9 @@ void sync_timeline_signal(struct sync_timeline *obj);
*/
struct fence *sync_pt_create(struct sync_timeline *parent, int size);
-/**
- * sync_fence_create() - creates a sync fence
- * @name: name of fence to create
- * @fence: fence to add to the sync_fence
- *
- * Creates a sync_file containg @fence. Once this is called, the sync_file
- * takes ownership of @fence.
- */
struct sync_file *sync_file_create(const char *name, struct fence *fence);
-
-/*
- * API for sync_file consumers
- */
-
-/**
- * sync_file_merge() - merge two sync_files
- * @name: name of new fence
- * @a: sync_file a
- * @b: sync_file b
- *
- * Creates a new sync_file which contains copies of all the fences in both
- * @a and @b. @a and @b remain valid, independent sync_file. Returns the
- * new merged sync_file or NULL in case of error.
- */
struct sync_file *sync_file_merge(const char *name,
struct sync_file *a, struct sync_file *b);
-
-/**
- * sync_file_fdget() - get a sync_file from an fd
- * @fd: fd referencing a fence
- *
- * Ensures @fd references a valid sync_file, increments the refcount of the
- * backing file. Returns the sync_file or NULL in case of error.
- */
struct sync_file *sync_file_fdget(int fd);
#ifdef CONFIG_DEBUG_FS
--
2.5.5
next prev parent reply other threads:[~2016-04-28 13:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 13:46 [PATCH v2 00/13] De-stage Sync File Framework Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 01/13] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan
2016-04-28 13:46 ` Gustavo Padovan [this message]
2016-04-28 13:46 ` [PATCH v2 04/13] staging/android: make sync_file_merge() static Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 05/13] staging/android: make sync_file_fdget() static Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 06/13] staging/android: remove name arg from sync_file_create() Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 07/13] staging/android: prepare sync_file for de-staging Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 08/13] staging/android: improve documentation for sync_file Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 09/13] staging/android: style fix: alignment to match the open parenthesis Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 10/13] dma-buf/sync_file: de-stage sync_file headers Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 11/13] dma-buf/sync_file: de-stage sync_file Gustavo Padovan
2016-04-28 13:46 ` [PATCH v2 12/13] Documentation: include sync_file into DocBook Gustavo Padovan
2016-04-28 13:47 ` [PATCH v2 13/13] Documentation: add Sync File doc Gustavo Padovan
2016-04-30 0:39 ` [PATCH v2 00/13] De-stage Sync File Framework Greg Kroah-Hartman
[not found] <00dd01d1a1f1$100af980$3020ec80$@alibaba-inc.com>
2016-04-29 8:31 ` [PATCH v2 03/13] staging/android: move sync_file functions comments to sync.c Hillf Danton
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=1461851220-1583-4-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@linux.intel.com \
--cc=riandrews@android.com \
--cc=robdclark@gmail.com \
--cc=sumit.semwal@linaro.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®