summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-04-26 16:03:01 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-03 11:18:21 +0200
commit9574b3fe29ba9064c03e8db0e399f5fe356ee03b (patch)
tree7617da0bd5422f715afd9f19e84eaa90465712eb /drivers/gpu/drm/i915/i915_drv.h
parentbe998e2e3945d97ffad3c800ef52fd487868b3e9 (diff)
downloadlwn-9574b3fe29ba9064c03e8db0e399f5fe356ee03b.tar.gz
lwn-9574b3fe29ba9064c03e8db0e399f5fe356ee03b.zip
drm/i915: kill waiting_seqno
The waiting_seqno is not terribly useful, and as such we can remove it so that we'll be able to extract lockless code. v2: Keep the information for error_state (Chris) Check if ring is initialized in hangcheck (Chris) Capture the waiting ring (Chris) Signed-off-by: Ben Widawsky <ben@bwidawsk.net> [danvet: add some bikeshed to clarify a comment.] 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e719522cb40b..ca13098c7573 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -174,6 +174,7 @@ struct drm_i915_error_state {
u32 eir;
u32 pgtbl_er;
u32 ier;
+ bool waiting[I915_NUM_RINGS];
u32 pipestat[I915_MAX_PIPES];
u32 tail[I915_NUM_RINGS];
u32 head[I915_NUM_RINGS];