summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorChris Wilson2017-05-04 15:08:45 +0200
committerChris Wilson2017-05-04 16:40:38 +0200
commit95aebcb2da73079f9ecb7f4e353af71ff1f04c05 (patch)
treef30a90272fa56d732bec4b3091c26539b619fc87 /drivers/gpu/drm/i915/intel_ringbuffer.h
parentdrm/i915: Avoid the branch in computing intel_ring_space() (diff)
downloadkernel-qcow2-linux-95aebcb2da73079f9ecb7f4e353af71ff1f04c05.tar.gz
kernel-qcow2-linux-95aebcb2da73079f9ecb7f4e353af71ff1f04c05.tar.xz
kernel-qcow2-linux-95aebcb2da73079f9ecb7f4e353af71ff1f04c05.zip
drm/i915: Report the ring->space from intel_ring_update_space()
Some callers immediately want to know the current ring->space after calling intel_ring_update_space(), which we can freely provide via the return parameter. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170504130846.4807-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 650ab884d6c8..3e343b09eeb6 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -486,7 +486,7 @@ int intel_ring_pin(struct intel_ring *ring,
struct drm_i915_private *i915,
unsigned int offset_bias);
void intel_ring_reset(struct intel_ring *ring, u32 tail);
-void intel_ring_update_space(struct intel_ring *ring);
+unsigned int intel_ring_update_space(struct intel_ring *ring);
void intel_ring_unpin(struct intel_ring *ring);
void intel_ring_free(struct intel_ring *ring);