1 files changed, 70 insertions, 23 deletions

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 0422b8c2c2e7..f776fc1cc543 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -262,8 +262,14 @@ void drm_syncobj_free(struct kref *kref)
 }
 EXPORT_SYMBOL(drm_syncobj_free);
 
-static int drm_syncobj_create(struct drm_file *file_private,
-                              u32 *handle, uint32_t flags)
+/**
+ * drm_syncobj_create - create a new syncobj
+ * @out_syncobj: returned syncobj
+ * @flags: DRM_SYNCOBJ_* flags
+ * @fence: if non-NULL, the syncobj will represent this fence
+ */
+int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
+                       struct dma_fence *fence)
 {
         int ret;
         struct drm_syncobj *syncobj;
@@ -284,6 +290,25 @@ static int drm_syncobj_create(struct drm_file *file_private,
                 }
         }
 
+        if (fence)
+                drm_syncobj_replace_fence(syncobj, fence);
+
+        *out_syncobj = syncobj;
+        return 0;
+}
+EXPORT_SYMBOL(drm_syncobj_create);
+
+/**
+ * drm_syncobj_get_handle - get a handle from a syncobj
+ */
+int drm_syncobj_get_handle(struct drm_file *file_private,
+                           struct drm_syncobj *syncobj, u32 *handle)
+{
+        int ret;
+
+        /* take a reference to put in the idr */
+        drm_syncobj_get(syncobj);
+
         idr_preload(GFP_KERNEL);
         spin_lock(&file_private->syncobj_table_lock);
         ret = idr_alloc(&file_private->syncobj_idr, syncobj, 1, 0, GFP_NOWAIT);
@@ -299,6 +324,22 @@ static int drm_syncobj_create(struct drm_file *file_private,
         *handle = ret;
         return 0;
 }
+EXPORT_SYMBOL(drm_syncobj_get_handle);
+
+static int drm_syncobj_create_as_handle(struct drm_file *file_private,
+                                        u32 *handle, uint32_t flags)
+{
+        int ret;
+        struct drm_syncobj *syncobj;
+
+        ret = drm_syncobj_create(&syncobj, flags, NULL);
+        if (ret)
+                return ret;
+
+        ret = drm_syncobj_get_handle(file_private, syncobj, handle);
+        drm_syncobj_put(syncobj);
+        return ret;
+}
 
 static int drm_syncobj_destroy(struct drm_file *file_private,
                                u32 handle)
@@ -345,33 +386,38 @@ static int drm_syncobj_alloc_file(struct drm_syncobj *syncobj)
         return 0;
 }
 
-static int drm_syncobj_handle_to_fd(struct drm_file *file_private,
-                                    u32 handle, int *p_fd)
+int drm_syncobj_get_fd(struct drm_syncobj *syncobj, int *p_fd)
 {
-        struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle);
         int ret;
         int fd;
 
-        if (!syncobj)
-                return -EINVAL;
-
         fd = get_unused_fd_flags(O_CLOEXEC);
-        if (fd < 0) {
-                drm_syncobj_put(syncobj);
+        if (fd < 0)
                 return fd;
-        }
 
         if (!syncobj->file) {
                 ret = drm_syncobj_alloc_file(syncobj);
-                if (ret)
-                        goto out_put_fd;
+                if (ret) {
+                        put_unused_fd(fd);
+                        return ret;
+                }
         }
         fd_install(fd, syncobj->file);
-        drm_syncobj_put(syncobj);
         *p_fd = fd;
         return 0;
-out_put_fd:
-        put_unused_fd(fd);
+}
+EXPORT_SYMBOL(drm_syncobj_get_fd);
+
+static int drm_syncobj_handle_to_fd(struct drm_file *file_private,
+                                    u32 handle, int *p_fd)
+{
+        struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle);
+        int ret;
+
+        if (!syncobj)
+                return -EINVAL;
+
+        ret = drm_syncobj_get_fd(syncobj, p_fd);
         drm_syncobj_put(syncobj);
         return ret;
 }
@@ -417,8 +463,8 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,
         return 0;
 }
 
-int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
-                                       int fd, int handle)
+static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
+                                              int fd, int handle)
 {
         struct dma_fence *fence = sync_file_get_fence(fd);
         struct drm_syncobj *syncobj;
@@ -438,8 +484,8 @@ int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
         return 0;
 }
 
-int drm_syncobj_export_sync_file(struct drm_file *file_private,
-                                 int handle, int *p_fd)
+static int drm_syncobj_export_sync_file(struct drm_file *file_private,
+                                        int handle, int *p_fd)
 {
         int ret;
         struct dma_fence *fence;
@@ -522,8 +568,8 @@ drm_syncobj_create_ioctl(struct drm_device *dev, void *data,
         if (args->flags & ~DRM_SYNCOBJ_CREATE_SIGNALED)
                 return -EINVAL;
 
-        return drm_syncobj_create(file_private,
-                                  &args->handle, args->flags);
+        return drm_syncobj_create_as_handle(file_private,
+                                            &args->handle, args->flags);
 }
 
 int
@@ -799,7 +845,8 @@ static int drm_syncobj_array_wait(struct drm_device *dev,
 }
 
 static int drm_syncobj_array_find(struct drm_file *file_private,
-                                  void *user_handles, uint32_t count_handles,
+                                  void __user *user_handles,
+                                  uint32_t count_handles,
                                   struct drm_syncobj ***syncobjs_out)
 {
         uint32_t i, *handles;