Commit b9a3906b authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter

drm/i915: add ccid to error state

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
parent dfabbcb4
...@@ -713,6 +713,7 @@ static int i915_error_state(struct seq_file *m, void *unused) ...@@ -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, "EIR: 0x%08x\n", error->eir);
seq_printf(m, "IER: 0x%08x\n", error->ier); seq_printf(m, "IER: 0x%08x\n", error->ier);
seq_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er); 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++) for (i = 0; i < dev_priv->num_fence_regs; i++)
seq_printf(m, " fence[%d] = %08llx\n", i, error->fence[i]); seq_printf(m, " fence[%d] = %08llx\n", i, error->fence[i]);
......
...@@ -176,6 +176,7 @@ struct drm_i915_error_state { ...@@ -176,6 +176,7 @@ struct drm_i915_error_state {
u32 eir; u32 eir;
u32 pgtbl_er; u32 pgtbl_er;
u32 ier; u32 ier;
u32 ccid;
bool waiting[I915_NUM_RINGS]; bool waiting[I915_NUM_RINGS];
u32 pipestat[I915_MAX_PIPES]; u32 pipestat[I915_MAX_PIPES];
u32 tail[I915_NUM_RINGS]; u32 tail[I915_NUM_RINGS];
......
...@@ -1156,6 +1156,7 @@ static void i915_capture_error_state(struct drm_device *dev) ...@@ -1156,6 +1156,7 @@ static void i915_capture_error_state(struct drm_device *dev)
kref_init(&error->ref); kref_init(&error->ref);
error->eir = I915_READ(EIR); error->eir = I915_READ(EIR);
error->pgtbl_er = I915_READ(PGTBL_ER); error->pgtbl_er = I915_READ(PGTBL_ER);
error->ccid = I915_READ(CCID);
if (HAS_PCH_SPLIT(dev)) if (HAS_PCH_SPLIT(dev))
error->ier = I915_READ(DEIER) | I915_READ(GTIER); error->ier = I915_READ(DEIER) | I915_READ(GTIER);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment