Merge tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc...

[karo-tx-linux.git] / drivers / dma-buf / dma-buf.c

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 0007b792827b7ec16a21351f924522e7344a6c92..f72aaacbe023d702c0256c9dcc5345a63f9fa022 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1059,7 +1059,11 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
        int ret;
        struct dma_buf *buf_obj;
        struct dma_buf_attachment *attach_obj;
-       int count = 0, attach_count;
+       struct reservation_object *robj;
+       struct reservation_object_list *fobj;
+       struct dma_fence *fence;
+       unsigned seq;
+       int count = 0, attach_count, shared_count, i;
        size_t size = 0;
 
        ret = mutex_lock_interruptible(&db_list.lock);
@@ -1068,7 +1072,8 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
                return ret;
 
        seq_puts(s, "\nDma-buf Objects:\n");
-       seq_puts(s, "size\tflags\tmode\tcount\texp_name\n");
+       seq_printf(s, "%-8s\t%-8s\t%-8s\t%-8s\texp_name\n",
+                  "size", "flags", "mode", "count");
 
        list_for_each_entry(buf_obj, &db_list.head, list_node) {
                ret = mutex_lock_interruptible(&buf_obj->lock);
@@ -1085,6 +1090,34 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused)
                                file_count(buf_obj->file),
                                buf_obj->exp_name);
 
+               robj = buf_obj->resv;
+               while (true) {
+                       seq = read_seqcount_begin(&robj->seq);
+                       rcu_read_lock();
+                       fobj = rcu_dereference(robj->fence);
+                       shared_count = fobj ? fobj->shared_count : 0;
+                       fence = rcu_dereference(robj->fence_excl);
+                       if (!read_seqcount_retry(&robj->seq, seq))
+                               break;
+                       rcu_read_unlock();
+               }
+
+               if (fence)
+                       seq_printf(s, "\tExclusive fence: %s %s %ssignalled\n",
+                                  fence->ops->get_driver_name(fence),
+                                  fence->ops->get_timeline_name(fence),
+                                  dma_fence_is_signaled(fence) ? "" : "un");
+               for (i = 0; i < shared_count; i++) {
+                       fence = rcu_dereference(fobj->shared[i]);
+                       if (!dma_fence_get_rcu(fence))
+                               continue;
+                       seq_printf(s, "\tShared fence: %s %s %ssignalled\n",
+                                  fence->ops->get_driver_name(fence),
+                                  fence->ops->get_timeline_name(fence),
+                                  dma_fence_is_signaled(fence) ? "" : "un");
+               }
+               rcu_read_unlock();
+
                seq_puts(s, "\tAttached Devices:\n");
                attach_count = 0;