1 files changed, 66 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6badc1596ceb..b2b46c52294c 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -40,8 +40,6 @@
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 
-#if defined(CONFIG_DEBUG_FS)
-
 enum {
         ACTIVE_LIST,
         INACTIVE_LIST,
@@ -406,16 +404,26 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
         seq_putc(m, '\n');
         list_for_each_entry_reverse(file, &dev->filelist, lhead) {
                 struct file_stats stats;
+                struct task_struct *task;
 
                 memset(&stats, 0, sizeof(stats));
                 idr_for_each(&file->object_idr, per_file_stats, &stats);
+                /*
+                 * Although we have a valid reference on file->pid, that does
+                 * not guarantee that the task_struct who called get_pid() is
+                 * still alive (e.g. get_pid(current) => fork() => exit()).
+                 * Therefore, we need to protect this ->comm access using RCU.
+                 */
+                rcu_read_lock();
+                task = pid_task(file->pid, PIDTYPE_PID);
                 seq_printf(m, "%s: %u objects, %zu bytes (%zu active, %zu inactive, %zu unbound)\n",
-                           get_pid_task(file->pid, PIDTYPE_PID)->comm,
+                           task ? task->comm : "<unknown>",
                            stats.count,
                            stats.total,
                            stats.active,
                            stats.inactive,
                            stats.unbound);
+                rcu_read_unlock();
         }
 
         mutex_unlock(&dev->struct_mutex);
@@ -1170,6 +1178,50 @@ static int ironlake_drpc_info(struct seq_file *m)
         return 0;
 }
 
+static int vlv_drpc_info(struct seq_file *m)
+{
+
+        struct drm_info_node *node = (struct drm_info_node *) m->private;
+        struct drm_device *dev = node->minor->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        u32 rpmodectl1, rcctl1;
+        unsigned fw_rendercount = 0, fw_mediacount = 0;
+
+        rpmodectl1 = I915_READ(GEN6_RP_CONTROL);
+        rcctl1 = I915_READ(GEN6_RC_CONTROL);
+
+        seq_printf(m, "Video Turbo Mode: %s\n",
+                   yesno(rpmodectl1 & GEN6_RP_MEDIA_TURBO));
+        seq_printf(m, "Turbo enabled: %s\n",
+                   yesno(rpmodectl1 & GEN6_RP_ENABLE));
+        seq_printf(m, "HW control enabled: %s\n",
+                   yesno(rpmodectl1 & GEN6_RP_ENABLE));
+        seq_printf(m, "SW control enabled: %s\n",
+                   yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) ==
+                          GEN6_RP_MEDIA_SW_MODE));
+        seq_printf(m, "RC6 Enabled: %s\n",
+                   yesno(rcctl1 & (GEN7_RC_CTL_TO_MODE |
+                                        GEN6_RC_CTL_EI_MODE(1))));
+        seq_printf(m, "Render Power Well: %s\n",
+                        (I915_READ(VLV_GTLC_PW_STATUS) &
+                                VLV_GTLC_PW_RENDER_STATUS_MASK) ? "Up" : "Down");
+        seq_printf(m, "Media Power Well: %s\n",
+                        (I915_READ(VLV_GTLC_PW_STATUS) &
+                                VLV_GTLC_PW_MEDIA_STATUS_MASK) ? "Up" : "Down");
+
+        spin_lock_irq(&dev_priv->uncore.lock);
+        fw_rendercount = dev_priv->uncore.fw_rendercount;
+        fw_mediacount = dev_priv->uncore.fw_mediacount;
+        spin_unlock_irq(&dev_priv->uncore.lock);
+
+        seq_printf(m, "Forcewake Render Count = %u\n", fw_rendercount);
+        seq_printf(m, "Forcewake Media Count = %u\n", fw_mediacount);
+
+
+        return 0;
+}
+
+
 static int gen6_drpc_info(struct seq_file *m)
 {
 
@@ -1275,7 +1327,9 @@ static int i915_drpc_info(struct seq_file *m, void *unused)
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
 
-        if (IS_GEN6(dev) || IS_GEN7(dev))
+        if (IS_VALLEYVIEW(dev))
+                return vlv_drpc_info(m);
+        else if (IS_GEN6(dev) || IS_GEN7(dev))
                 return gen6_drpc_info(m);
         else
                 return ironlake_drpc_info(m);
@@ -1287,7 +1341,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
 
-        if (!I915_HAS_FBC(dev)) {
+        if (!HAS_FBC(dev)) {
                 seq_puts(m, "FBC unsupported on this chipset\n");
                 return 0;
         }
@@ -1349,7 +1403,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)
                 return 0;
         }
 
-        if (I915_READ(IPS_CTL) & IPS_ENABLE)
+        if (IS_BROADWELL(dev) || I915_READ(IPS_CTL) & IPS_ENABLE)
                 seq_puts(m, "enabled\n");
         else
                 seq_puts(m, "disabled\n");
@@ -2117,8 +2171,8 @@ static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor,
         info->dev = dev;
         ent = debugfs_create_file(info->name, S_IRUGO, root, info,
                                   &i915_pipe_crc_fops);
-        if (IS_ERR(ent))
-                return PTR_ERR(ent);
+        if (!ent)
+                return -ENOMEM;
 
         return drm_add_fake_info_node(minor, ent, info);
 }
@@ -3133,8 +3187,8 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor)
                                   S_IRUSR,
                                   root, dev,
                                   &i915_forcewake_fops);
-        if (IS_ERR(ent))
-                return PTR_ERR(ent);
+        if (!ent)
+                return -ENOMEM;
 
         return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops);
 }
@@ -3151,8 +3205,8 @@ static int i915_debugfs_create(struct dentry *root,
                                   S_IRUGO | S_IWUSR,
                                   root, dev,
                                   fops);
-        if (IS_ERR(ent))
-                return PTR_ERR(ent);
+        if (!ent)
+                return -ENOMEM;
 
         return drm_add_fake_info_node(minor, ent, fops);
 }
@@ -3282,5 +3336,3 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
                 drm_debugfs_remove_files(info_list, 1, minor);
         }
 }
-
-#endif /* CONFIG_DEBUG_FS */