| Message ID | 1467378307-28088-4-git-send-email-gustavo@padovan.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 01, 2016 at 10:05:06AM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Creates a function that given an sync file descriptor returns a > fence containing all fences in the sync_file. > > v2: Comments by Daniel Vetter > - Adapt to new version of fence_collection_init() > - Hold a reference for the fence we return > > v3: > - Adapt to use fput() directly > - rename to sync_file_get_fence() as we always return one fence > > v4: Adapt to use fence_array > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > --- > drivers/dma-buf/sync_file.c | 24 ++++++++++++++++++++++++ > include/linux/sync_file.h | 1 + > 2 files changed, 25 insertions(+) > > diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c > index 12dbf17..3ffaea8 100644 > --- a/drivers/dma-buf/sync_file.c > +++ b/drivers/dma-buf/sync_file.c > @@ -116,6 +116,30 @@ err: > return NULL; > } > > +/** > + * sync_file_get_fence - get the fence related to the sync_file fd > + * @fd: sync_file fd to get the fence from > + * > + * Ensures @fd references a valid sync_file and returns a fence that > + * represents all fence in the sync_file. On error NULL is returned. > + */ > +struct fence *sync_file_get_fence(int fd) > +{ > + struct sync_file *sync_file; > + struct fence *fence; > + > + sync_file = sync_file_fdget(fd); > + if (!sync_file) > + return NULL; > + > + fence = sync_file->fence; > + fence_get(fence); Or just fence = get_fence(sync_file->fence); > + fput(sync_file->file); Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Using fence-array for this works very nicely, as we can then inspect the fences returned and handle native fences for fd passed around. -Chris
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c index 12dbf17..3ffaea8 100644 --- a/drivers/dma-buf/sync_file.c +++ b/drivers/dma-buf/sync_file.c @@ -116,6 +116,30 @@ err: return NULL; } +/** + * sync_file_get_fence - get the fence related to the sync_file fd + * @fd: sync_file fd to get the fence from + * + * Ensures @fd references a valid sync_file and returns a fence that + * represents all fence in the sync_file. On error NULL is returned. + */ +struct fence *sync_file_get_fence(int fd) +{ + struct sync_file *sync_file; + struct fence *fence; + + sync_file = sync_file_fdget(fd); + if (!sync_file) + return NULL; + + fence = sync_file->fence; + fence_get(fence); + fput(sync_file->file); + + return fence; +} +EXPORT_SYMBOL(sync_file_get_fence); + static int sync_file_set_fence(struct sync_file *sync_file, struct fence **fences, int num_fences) { diff --git a/include/linux/sync_file.h b/include/linux/sync_file.h index 2efc5ec..f7de5a0 100644 --- a/include/linux/sync_file.h +++ b/include/linux/sync_file.h @@ -46,5 +46,6 @@ struct sync_file { }; struct sync_file *sync_file_create(struct fence *fence); +struct fence *sync_file_get_fence(int fd); #endif /* _LINUX_SYNC_H */