diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2011-03-20 01:14:27 (GMT) |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-10 20:56:40 (GMT) |
| commit | 96f298aa9c9fc9b7c8a2ebaf8c195d178f570e09 (patch) | |
| tree | cfb71da9613d701728520ec5f916e7cb6aa8a889 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 2c34b850ee1e9f86b41706149d0954eee58757a3 (diff) | |
| download | linux-fsl-qoriq-96f298aa9c9fc9b7c8a2ebaf8c195d178f570e09.tar.xz | |
drm/1915: ringbuffer wait for idle function
Added a new function which waits for the ringbuffer space to be equal to
(total - 8). This is the empty condition of the ringbuffer, and
equivalent to head==tail.
Also modified two users of this functionality elsewhere in the code.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 884556d..07e5907 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -873,7 +873,7 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring) /* Disable the ring buffer. The ring must be idle at this point */ dev_priv = ring->dev->dev_private; - ret = intel_wait_ring_buffer(ring, ring->size - 8); + ret = intel_wait_ring_idle(ring); if (ret) DRM_ERROR("failed to quiesce %s whilst cleaning up: %d\n", ring->name, ret); |