Merge branch 'pm-qos'

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_info.c

diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 3c99f6f608185a79b5e4c0eea38edbc6bbabe53c..51efebd434f302d61134c2eb384935ef4c1b2521 100644 (file)
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -35,6 +35,9 @@
 
 #include <linux/seq_file.h>
 #include <drm/drmP.h>
+#include <drm/drm_gem.h>
+
+#include "drm_legacy.h"
 
 /**
  * Called when "/proc/dri/.../name" is read.
@@ -183,15 +186,32 @@ int drm_clients_info(struct seq_file *m, void *data)
        struct drm_device *dev = node->minor->dev;
        struct drm_file *priv;
 
+       seq_printf(m,
+                  "%20s %5s %3s master a %5s %10s\n",
+                  "command",
+                  "pid",
+                  "dev",
+                  "uid",
+                  "magic");
+
+       /* dev->filelist is sorted youngest first, but we want to present
+        * oldest first (i.e. kernel, servers, clients), so walk backwardss.
+        */
        mutex_lock(&dev->struct_mutex);
-       seq_printf(m, "a dev    pid    uid      magic\n\n");
-       list_for_each_entry(priv, &dev->filelist, lhead) {
-               seq_printf(m, "%c %3d %5d %5d %10u\n",
-                          priv->authenticated ? 'y' : 'n',
-                          priv->minor->index,
+       list_for_each_entry_reverse(priv, &dev->filelist, lhead) {
+               struct task_struct *task;
+
+               rcu_read_lock(); /* locks pid_task()->comm */
+               task = pid_task(priv->pid, PIDTYPE_PID);
+               seq_printf(m, "%20s %5d %3d   %c    %c %5d %10u\n",
+                          task ? task->comm : "<unknown>",
                           pid_vnr(priv->pid),
+                          priv->minor->index,
+                          priv->is_master ? 'y' : 'n',
+                          priv->authenticated ? 'y' : 'n',
                           from_kuid_munged(seq_user_ns(m), priv->uid),
                           priv->magic);
+               rcu_read_unlock();
        }
        mutex_unlock(&dev->struct_mutex);
        return 0;