summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-04 17:34:02 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-11 20:43:55 +0000
commitb72f3acb71646de073abdc070fe1108866c96634 (patch)
treeb98b4a5a158c000965ecda31257ecca973946a6b /drivers/gpu/drm/i915/intel_ringbuffer.h
parent63256ec5347fb2344a42adbae732b90603c92f35 (diff)
downloadblackbird-op-linux-b72f3acb71646de073abdc070fe1108866c96634.tar.gz
blackbird-op-linux-b72f3acb71646de073abdc070fe1108866c96634.zip
drm/i915: Handle ringbuffer stalls when flushing
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index bbbf505c8b56..5969c2ed1028 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -63,9 +63,9 @@ struct intel_ring_buffer {
void (*write_tail)(struct intel_ring_buffer *ring,
u32 value);
- void (*flush)(struct intel_ring_buffer *ring,
- u32 invalidate_domains,
- u32 flush_domains);
+ int __must_check (*flush)(struct intel_ring_buffer *ring,
+ u32 invalidate_domains,
+ u32 flush_domains);
int (*add_request)(struct intel_ring_buffer *ring,
u32 *seqno);
u32 (*get_seqno)(struct intel_ring_buffer *ring);
OpenPOWER on IntegriCloud