Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 41c65cae5a6689d1662e4b5070096db090a76c80..aae31489c89304f8d79ad2319bbb0ecb97897cef 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1484,7 +1484,8 @@ static int i915_context_status(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;
+       struct intel_ring_buffer *ring;
+       int ret, i;
 
        ret = mutex_lock_interruptible(&dev->mode_config.mutex);
        if (ret)
@@ -1502,6 +1503,14 @@ static int i915_context_status(struct seq_file *m, void *unused)
                seq_printf(m, "\n");
        }
 
+       for_each_ring(ring, dev_priv, i) {
+               if (ring->default_context) {
+                       seq_printf(m, "HW default context %s ring ", ring->name);
+                       describe_obj(m, ring->default_context->obj);
+                       seq_printf(m, "\n");
+               }
+       }
+
        mutex_unlock(&dev->mode_config.mutex);
 
        return 0;
@@ -1541,7 +1550,7 @@ static const char *swizzle_string(unsigned swizzle)
        case I915_BIT_6_SWIZZLE_9_10_17:
                return "bit9/bit10/bit17";
        case I915_BIT_6_SWIZZLE_UNKNOWN:
-               return "unkown";
+               return "unknown";
        }
 
        return "bug";