Merge branch 'drm-misc-next-fixes' into drm-misc-fixes

Pick up

1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path

From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.

4 files changed, 48 insertions, 27 deletions

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 512bdbc23bbb..4a038dcf5361 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -558,8 +558,8 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
         if (WARN_ON(!dmabuf || !dev))
                 return ERR_PTR(-EINVAL);
 
-        attach = kzalloc(sizeof(struct dma_buf_attachment), GFP_KERNEL);
-        if (attach == NULL)
+        attach = kzalloc(sizeof(*attach), GFP_KERNEL);
+        if (!attach)
                 return ERR_PTR(-ENOMEM);
 
         attach->dev = dev;
@@ -1122,9 +1122,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
                 attach_count = 0;
 
                 list_for_each_entry(attach_obj, &buf_obj->attachments, node) {
-                        seq_puts(s, "\t");
-
-                        seq_printf(s, "%s\n", dev_name(attach_obj->dev));
+                        seq_printf(s, "\t%s\n", dev_name(attach_obj->dev));
                         attach_count++;
                 }
 
diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index 13556fdda2a5..56e0a0e1b600 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -397,6 +397,11 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout)
                 }
         }
 
+        if (!timeout) {
+                ret = 0;
+                goto out;
+        }
+
         cb.base.func = dma_fence_default_wait_cb;
         cb.task = current;
         list_add(&cb.base.node, &fence->cb_list);
diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c
index bfead12390f2..59a3b2f8ee91 100644
--- a/drivers/dma-buf/sync_debug.c
+++ b/drivers/dma-buf/sync_debug.c
@@ -110,7 +110,7 @@ static void sync_print_fence(struct seq_file *s,
                 }
         }
 
-        seq_puts(s, "\n");
+        seq_putc(s, '\n');
 }
 
 static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
@@ -132,9 +132,11 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
 static void sync_print_sync_file(struct seq_file *s,
                                   struct sync_file *sync_file)
 {
+        char buf[128];
         int i;
 
-        seq_printf(s, "[%p] %s: %s\n", sync_file, sync_file->name,
+        seq_printf(s, "[%p] %s: %s\n", sync_file,
+                   sync_file_get_name(sync_file, buf, sizeof(buf)),
                    sync_status_str(dma_fence_get_status(sync_file->fence)));
 
         if (dma_fence_is_array(sync_file->fence)) {
@@ -161,7 +163,7 @@ static int sync_debugfs_show(struct seq_file *s, void *unused)
                                      sync_timeline_list);
 
                 sync_print_obj(s, obj);
-                seq_puts(s, "\n");
+                seq_putc(s, '\n');
         }
         spin_unlock_irqrestore(&sync_timeline_list_lock, flags);
 
@@ -173,7 +175,7 @@ static int sync_debugfs_show(struct seq_file *s, void *unused)
                         container_of(pos, struct sync_file, sync_file_list);
 
                 sync_print_sync_file(s, sync_file);
-                seq_puts(s, "\n");
+                seq_putc(s, '\n');
         }
         spin_unlock_irqrestore(&sync_file_list_lock, flags);
         return 0;
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index 95f259b719fc..d7e219d2669d 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -41,8 +41,6 @@ static struct sync_file *sync_file_alloc(void)
         if (IS_ERR(sync_file->file))
                 goto err;
 
-        kref_init(&sync_file->kref);
-
         init_waitqueue_head(&sync_file->wq);
 
         INIT_LIST_HEAD(&sync_file->cb.node);
@@ -82,11 +80,6 @@ struct sync_file *sync_file_create(struct dma_fence *fence)
 
         sync_file->fence = dma_fence_get(fence);
 
-        snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%llu-%d",
-                 fence->ops->get_driver_name(fence),
-                 fence->ops->get_timeline_name(fence), fence->context,
-                 fence->seqno);
-
         return sync_file;
 }
 EXPORT_SYMBOL(sync_file_create);
@@ -131,6 +124,36 @@ struct dma_fence *sync_file_get_fence(int fd)
 }
 EXPORT_SYMBOL(sync_file_get_fence);
 
+/**
+ * sync_file_get_name - get the name of the sync_file
+ * @sync_file:          sync_file to get the fence from
+ * @buf:                destination buffer to copy sync_file name into
+ * @len:                available size of destination buffer.
+ *
+ * Each sync_file may have a name assigned either by the user (when merging
+ * sync_files together) or created from the fence it contains. In the latter
+ * case construction of the name is deferred until use, and so requires
+ * sync_file_get_name().
+ *
+ * Returns: a string representing the name.
+ */
+char *sync_file_get_name(struct sync_file *sync_file, char *buf, int len)
+{
+        if (sync_file->user_name[0]) {
+                strlcpy(buf, sync_file->user_name, len);
+        } else {
+                struct dma_fence *fence = sync_file->fence;
+
+                snprintf(buf, len, "%s-%s%llu-%d",
+                         fence->ops->get_driver_name(fence),
+                         fence->ops->get_timeline_name(fence),
+                         fence->context,
+                         fence->seqno);
+        }
+
+        return buf;
+}
+
 static int sync_file_set_fence(struct sync_file *sync_file,
                                struct dma_fence **fences, int num_fences)
 {
@@ -268,7 +291,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
                 goto err;
         }
 
-        strlcpy(sync_file->name, name, sizeof(sync_file->name));
+        strlcpy(sync_file->user_name, name, sizeof(sync_file->user_name));
         return sync_file;
 
 err:
@@ -277,22 +300,15 @@ err:
 
 }
 
-static void sync_file_free(struct kref *kref)
+static int sync_file_release(struct inode *inode, struct file *file)
 {
-        struct sync_file *sync_file = container_of(kref, struct sync_file,
-                                                     kref);
+        struct sync_file *sync_file = file->private_data;
 
         if (test_bit(POLL_ENABLED, &sync_file->fence->flags))
                 dma_fence_remove_callback(sync_file->fence, &sync_file->cb);
         dma_fence_put(sync_file->fence);
         kfree(sync_file);
-}
-
-static int sync_file_release(struct inode *inode, struct file *file)
-{
-        struct sync_file *sync_file = file->private_data;
 
-        kref_put(&sync_file->kref, sync_file_free);
         return 0;
 }
 
@@ -428,7 +444,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
         }
 
 no_fences:
-        strlcpy(info.name, sync_file->name, sizeof(info.name));
+        sync_file_get_name(sync_file, info.name, sizeof(info.name));
         info.status = dma_fence_is_signaled(sync_file->fence);
         info.num_fences = num_fences;