Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / dma-buf / sync_file.c

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index ac9c250..b29a9e8 100644 (file)
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -86,8 +86,6 @@ struct sync_file *sync_file_create(struct fence *fence)
                 fence->ops->get_timeline_name(fence), fence->context,
                 fence->seqno);
 
-       fence_add_callback(fence, &sync_file->cb, fence_check_cb_func);
-
        return sync_file;
 }
 EXPORT_SYMBOL(sync_file_create);
@@ -116,6 +114,29 @@ 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 = fence_get(sync_file->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)
 {
@@ -129,6 +150,7 @@ static int sync_file_set_fence(struct sync_file *sync_file,
         */
        if (num_fences == 1) {
                sync_file->fence = fences[0];
+               kfree(fences);
        } else {
                array = fence_array_create(num_fences, fences,
                                           fence_context_alloc(1), 1, false);
@@ -232,10 +254,8 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
        for (; i_b < b_num_fences; i_b++)
                add_fence(fences, &i, b_fences[i_b]);
 
-       if (i == 0) {
-               add_fence(fences, &i, a_fences[0]);
-               i++;
-       }
+       if (i == 0)
+               fences[i++] = fence_get(a_fences[0]);
 
        if (num_fences > i) {
                nfences = krealloc(fences, i * sizeof(*fences),
@@ -251,9 +271,6 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
                goto err;
        }
 
-       fence_add_callback(sync_file->fence, &sync_file->cb,
-                          fence_check_cb_func);
-
        strlcpy(sync_file->name, name, sizeof(sync_file->name));
        return sync_file;
 
@@ -268,7 +285,8 @@ static void sync_file_free(struct kref *kref)
        struct sync_file *sync_file = container_of(kref, struct sync_file,
                                                     kref);
 
-       fence_remove_callback(sync_file->fence, &sync_file->cb);
+       if (test_bit(POLL_ENABLED, &sync_file->fence->flags))
+               fence_remove_callback(sync_file->fence, &sync_file->cb);
        fence_put(sync_file->fence);
        kfree(sync_file);
 }
@@ -284,17 +302,17 @@ static int sync_file_release(struct inode *inode, struct file *file)
 static unsigned int sync_file_poll(struct file *file, poll_table *wait)
 {
        struct sync_file *sync_file = file->private_data;
-       int status;
 
        poll_wait(file, &sync_file->wq, wait);
 
-       status = fence_is_signaled(sync_file->fence);
+       if (!poll_does_not_wait(wait) &&
+           !test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {
+               if (fence_add_callback(sync_file->fence, &sync_file->cb,
+                                      fence_check_cb_func) < 0)
+                       wake_up_all(&sync_file->wq);
+       }
 
-       if (status)
-               return POLLIN;
-       if (status < 0)
-               return POLLERR;
-       return 0;
+       return fence_is_signaled(sync_file->fence) ? POLLIN : 0;
 }
 
 static long sync_file_ioctl_merge(struct sync_file *sync_file,