Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / gpu / drm / i915 / i915_gem_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_gem_debugfs.c
index 455ec970b3854e64c38eace44e1d78bca9fe7db1..a1ac0c5e7307282a00fc859a240f5c4bf2c3dcca 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_gem_debugfs.c
@@ -69,10 +69,13 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)
        struct drm_device *dev = node->minor->dev;
        drm_i915_private_t *dev_priv = dev->dev_private;
        struct drm_i915_gem_object *obj_priv;
+       spinlock_t *lock = NULL;
 
        switch (list) {
        case ACTIVE_LIST:
                seq_printf(m, "Active:\n");
+               lock = &dev_priv->mm.active_list_lock;
+               spin_lock(lock);
                head = &dev_priv->mm.active_list;
                break;
        case INACTIVE_LIST:
@@ -104,6 +107,9 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)
                        seq_printf(m, " (fence: %d\n", obj_priv->fence_reg);
                seq_printf(m, "\n");
        }
+
+       if (lock)
+           spin_unlock(lock);
        return 0;
 }