diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2012-04-26 19:03:01 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 05:18:21 -0400 |
commit | 9574b3fe29ba9064c03e8db0e399f5fe356ee03b (patch) | |
tree | 7617da0bd5422f715afd9f19e84eaa90465712eb /drivers/gpu/drm/i915/intel_ringbuffer.h | |
parent | be998e2e3945d97ffad3c800ef52fd487868b3e9 (diff) |
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/intel_ringbuffer.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index e0b25bb2fb5d..d3bf2595589f 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
@@ -60,7 +60,6 @@ struct intel_ring_buffer { | |||
60 | u32 irq_enable_mask; /* bitmask to enable ring interrupt */ | 60 | u32 irq_enable_mask; /* bitmask to enable ring interrupt */ |
61 | u32 irq_seqno; /* last seq seem at irq time */ | 61 | u32 irq_seqno; /* last seq seem at irq time */ |
62 | u32 trace_irq_seqno; | 62 | u32 trace_irq_seqno; |
63 | u32 waiting_seqno; | ||
64 | u32 sync_seqno[I915_NUM_RINGS-1]; | 63 | u32 sync_seqno[I915_NUM_RINGS-1]; |
65 | bool __must_check (*irq_get)(struct intel_ring_buffer *ring); | 64 | bool __must_check (*irq_get)(struct intel_ring_buffer *ring); |
66 | void (*irq_put)(struct intel_ring_buffer *ring); | 65 | void (*irq_put)(struct intel_ring_buffer *ring); |