summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@linux.intel.com>2014-02-25 17:11:25 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-05 21:30:25 +0100
commitcb38300215dc24886347bfc6400ccfed806dac21 (patch)
treeb0f06090090c776bd1b3eb565ab4fcb0693c77d1 /drivers/gpu/drm/i915/i915_drv.h
parentab0e7ff9f2d0bfe139a2ed5bb6a36f8cbd4e0886 (diff)
downloadlwn-cb38300215dc24886347bfc6400ccfed806dac21.tar.gz
lwn-cb38300215dc24886347bfc6400ccfed806dac21.zip
drm/i915: Add error code into error state
commit 011cf577b2531dfbd2254bd9ec147ad71471abaf Author: Ben Widawsky <benjamin.widawsky@intel.com> Date: Tue Feb 4 12:18:55 2014 +0000 drm/i915: Generate a hang error code added error code debug into dmesg. Store this also with error state to make matching dmesg logs and error states easier. As we need to have full ring state for error code generation, do full capture always, print hang message into log and then decide if we need to keep the error state. Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 826fcaef25c1..7db735c1e764 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -303,6 +303,8 @@ struct drm_i915_error_state {
struct kref ref;
struct timeval time;
+ char error_msg[128];
+
/* Generic register state */
u32 eir;
u32 pgtbl_er;