summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-12-14 13:57:39 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-29 23:17:52 +0100
commit33f3f518fbb65d86f163083b74823e8bbe561bfc (patch)
tree512fa14a6daf62d52a63db8b3a360283a5e3d271 /drivers/gpu/drm/i915/i915_drv.h
parent4ca4a250ac93d5538a2a5c98ee2bcf9195f38be4 (diff)
downloadop-kernel-dev-33f3f518fbb65d86f163083b74823e8bbe561bfc.zip
op-kernel-dev-33f3f518fbb65d86f163083b74823e8bbe561bfc.tar.gz
drm/i915: add per-ring fault reg to error_state
This was pretty handy when figuring out what exactly went wrong with ppgtt and it might also be useful when we stop filling the entire gart with scratch page entries. Also add the gen6+ DONE reg while at it. v2: Chris Wilson suggested to allocate the error_state with kzalloc for better paranoia. Also kill existing spurious clears of the error_state while at it. Reviewed-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> 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 12e8cce..865de80 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -165,6 +165,8 @@ struct drm_i915_error_state {
u32 instdone1;
u32 seqno[I915_NUM_RINGS];
u64 bbaddr;
+ u32 fault_reg[I915_NUM_RINGS];
+ u32 done_reg;
u32 faddr[I915_NUM_RINGS];
u64 fence[I915_MAX_NUM_FENCES];
struct timeval time;
OpenPOWER on IntegriCloud