drm/i915: add ccid to error state
authorBen Widawsky <ben@bwidawsk.net>
Mon, 4 Jun 2012 21:42:52 +0000 (14:42 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 14 Jun 2012 15:36:19 +0000 (17:36 +0200)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c

index 4fa00fcfbc96cbdc8b34562c72604a50735c0aba..2909b123baf50147391e06923bc70b1a991098af 100644 (file)
@@ -713,6 +713,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
        seq_printf(m, "EIR: 0x%08x\n", error->eir);
        seq_printf(m, "IER: 0x%08x\n", error->ier);
        seq_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er);
+       seq_printf(m, "CCID: 0x%08x\n", error->ccid);
 
        for (i = 0; i < dev_priv->num_fence_regs; i++)
                seq_printf(m, "  fence[%d] = %08llx\n", i, error->fence[i]);
index 7fb0364d5d61e2a07bc6768bac6f211bba31f26b..6edc02b6dda405b0f0ca120594e6937dee2ead83 100644 (file)
@@ -176,6 +176,7 @@ struct drm_i915_error_state {
        u32 eir;
        u32 pgtbl_er;
        u32 ier;
+       u32 ccid;
        bool waiting[I915_NUM_RINGS];
        u32 pipestat[I915_MAX_PIPES];
        u32 tail[I915_NUM_RINGS];
index 0e876646d769c6cc5c7a1e03b054dd7770f74123..add0aaeadecd6ebb79aefd996e6073d0e69675c3 100644 (file)
@@ -1156,6 +1156,7 @@ static void i915_capture_error_state(struct drm_device *dev)
        kref_init(&error->ref);
        error->eir = I915_READ(EIR);
        error->pgtbl_er = I915_READ(PGTBL_ER);
+       error->ccid = I915_READ(CCID);
 
        if (HAS_PCH_SPLIT(dev))
                error->ier = I915_READ(DEIER) | I915_READ(GTIER);