diff options
| author | Chris Wilson | 2010-10-27 16:27:33 +0200 |
|---|---|---|
| committer | Chris Wilson | 2010-10-28 00:30:59 +0200 |
| commit | b2223497b44a4701d1be873d1e9453d7f720043b (patch) | |
| tree | 7e7e014512c25e410e67095e662dd0428dfb9c74 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915/debugfs: Include info for the other rings (diff) | |
| download | kernel-qcow2-linux-b2223497b44a4701d1be873d1e9453d7f720043b.tar.gz kernel-qcow2-linux-b2223497b44a4701d1be873d1e9453d7f720043b.tar.xz kernel-qcow2-linux-b2223497b44a4701d1be873d1e9453d7f720043b.zip | |
drm/i915: Remove the confusing global waiting/irq seqno
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 580244c1e793..74f5525d156f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1984,7 +1984,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, trace_i915_gem_request_wait_begin(dev, seqno); - ring->waiting_gem_seqno = seqno; + ring->waiting_seqno = seqno; ring->user_irq_get(ring); if (interruptible) ret = wait_event_interruptible(ring->irq_queue, @@ -1996,7 +1996,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, || atomic_read(&dev_priv->mm.wedged)); ring->user_irq_put(ring); - ring->waiting_gem_seqno = 0; + ring->waiting_seqno = 0; trace_i915_gem_request_wait_end(dev, seqno); } |