summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2014-01-30 00:19:40 -0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-01-30 13:01:02 +0100
commit6c7a01ec3743a5a6ce9e53a69d7a6c2d8c715eb1 (patch)
tree6a89d2028d1f7fc87915902bdf018e767a86ad6e /drivers/gpu/drm/i915/i915_drv.h
parent91ec5d11ab6fea7eafd0364b77cd39baf60cd8e3 (diff)
downloadlwn-6c7a01ec3743a5a6ce9e53a69d7a6c2d8c715eb1.tar.gz
lwn-6c7a01ec3743a5a6ce9e53a69d7a6c2d8c715eb1.zip
drm/i915: Capture PPGTT info on error capture
v2: Rebased upon cleaned up error state v3: Make sure hangcheck info remains last (Chris) Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> 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.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 34ff995e6ea3..1c8c77508238 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -361,6 +361,14 @@ struct drm_i915_error_state {
u32 seqno;
u32 tail;
} *requests;
+
+ struct {
+ u32 gfx_mode;
+ union {
+ u64 pdp[4];
+ u32 pp_dir_base;
+ };
+ } vm_info;
} ring[I915_NUM_RINGS];
struct drm_i915_error_buffer {
u32 size;
@@ -377,6 +385,7 @@ struct drm_i915_error_state {
s32 ring:4;
u32 cache_level:3;
} **active_bo, **pinned_bo;
+
u32 *active_bo_count, *pinned_bo_count;
};