diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2012-04-26 16:03:01 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 11:18:21 +0200 |
| commit | 9574b3fe29ba9064c03e8db0e399f5fe356ee03b (patch) | |
| tree | 7617da0bd5422f715afd9f19e84eaa90465712eb /drivers/gpu/drm/i915/i915_gem.c | |
| 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/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f194603140c..292b4a9e7ba 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1864,7 +1864,6 @@ i915_wait_request(struct intel_ring_buffer *ring, if (!i915_seqno_passed(ring->get_seqno(ring), seqno)) { trace_i915_gem_request_wait_begin(ring, seqno); - ring->waiting_seqno = seqno; if (ring->irq_get(ring)) { if (dev_priv->mm.interruptible) ret = wait_event_interruptible(ring->irq_queue, @@ -1880,7 +1879,6 @@ i915_wait_request(struct intel_ring_buffer *ring, seqno) || atomic_read(&dev_priv->mm.wedged), 3000)) ret = -EBUSY; - ring->waiting_seqno = 0; trace_i915_gem_request_wait_end(ring, seqno); } |