1 files changed, 56 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8e95d66800b..d09a6e02dc9 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -29,6 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include "drmP.h"
 #include "drm.h"
 #include "intel_drv.h"
@@ -635,11 +636,16 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct intel_ring_buffer *ring;
+        int ret;
 
         ring = &dev_priv->ring[(uintptr_t)node->info_ent->data];
         if (ring->size == 0)
                 return 0;
 
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
+
         seq_printf(m, "Ring %s:\n", ring->name);
         seq_printf(m, "  Head :    %08x\n", I915_READ_HEAD(ring) & HEAD_ADDR);
         seq_printf(m, "  Tail :    %08x\n", I915_READ_TAIL(ring) & TAIL_ADDR);
@@ -653,6 +659,8 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
         seq_printf(m, "  Control : %08x\n", I915_READ_CTL(ring));
         seq_printf(m, "  Start :   %08x\n", I915_READ_START(ring));
 
+        mutex_unlock(&dev->struct_mutex);
+
         return 0;
 }
 
@@ -841,7 +849,16 @@ static int i915_rstdby_delays(struct seq_file *m, void *unused)
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
-        u16 crstanddelay = I915_READ16(CRSTANDVID);
+        u16 crstanddelay;
+        int ret;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
+
+        crstanddelay = I915_READ16(CRSTANDVID);
+
+        mutex_unlock(&dev->struct_mutex);
 
         seq_printf(m, "w/ctx: %d, w/o ctx: %d\n", (crstanddelay >> 8) & 0x3f, (crstanddelay & 0x3f));
 
@@ -939,7 +956,11 @@ static int i915_delayfreq_table(struct seq_file *m, void *unused)
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         u32 delayfreq;
-        int i;
+        int ret, i;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
 
         for (i = 0; i < 16; i++) {
                 delayfreq = I915_READ(PXVFREQ_BASE + i * 4);
@@ -947,6 +968,8 @@ static int i915_delayfreq_table(struct seq_file *m, void *unused)
                            (delayfreq & PXVFREQ_PX_MASK) >> PXVFREQ_PX_SHIFT);
         }
 
+        mutex_unlock(&dev->struct_mutex);
+
         return 0;
 }
 
@@ -961,13 +984,19 @@ static int i915_inttoext_table(struct seq_file *m, void *unused)
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         u32 inttoext;
-        int i;
+        int ret, i;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
 
         for (i = 1; i <= 32; i++) {
                 inttoext = I915_READ(INTTOEXT_BASE_ILK + i * 4);
                 seq_printf(m, "INTTOEXT%02d: 0x%08x\n", i, inttoext);
         }
 
+        mutex_unlock(&dev->struct_mutex);
+
         return 0;
 }
 
@@ -976,9 +1005,19 @@ 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;
         drm_i915_private_t *dev_priv = dev->dev_private;
-        u32 rgvmodectl = I915_READ(MEMMODECTL);
-        u32 rstdbyctl = I915_READ(RSTDBYCTL);
-        u16 crstandvid = I915_READ16(CRSTANDVID);
+        u32 rgvmodectl, rstdbyctl;
+        u16 crstandvid;
+        int ret;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
+
+        rgvmodectl = I915_READ(MEMMODECTL);
+        rstdbyctl = I915_READ(RSTDBYCTL);
+        crstandvid = I915_READ16(CRSTANDVID);
+
+        mutex_unlock(&dev->struct_mutex);
 
         seq_printf(m, "HD boost: %s\n", (rgvmodectl & MEMMODE_BOOST_EN) ?
                    "yes" : "no");
@@ -1166,9 +1205,16 @@ static int i915_gfxec(struct seq_file *m, void *unused)
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
+        int ret;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
 
         seq_printf(m, "GFXEC: %ld\n", (unsigned long)I915_READ(0x112f4));
 
+        mutex_unlock(&dev->struct_mutex);
+
         return 0;
 }
 
@@ -1505,7 +1551,10 @@ drm_add_fake_info_node(struct drm_minor *minor,
         node->minor = minor;
         node->dent = ent;
         node->info_ent = (void *) key;
-        list_add(&node->list, &minor->debugfs_nodes.list);
+
+        mutex_lock(&minor->debugfs_lock);
+        list_add(&node->list, &minor->debugfs_list);
+        mutex_unlock(&minor->debugfs_lock);
 
         return 0;
 }