diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-04 12:34:02 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 15:43:55 -0500 |
commit | b72f3acb71646de073abdc070fe1108866c96634 (patch) | |
tree | b98b4a5a158c000965ecda31257ecca973946a6b /drivers/gpu/drm/i915/intel_ringbuffer.h | |
parent | 63256ec5347fb2344a42adbae732b90603c92f35 (diff) |
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.h | 6 |
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 { | |||
63 | 63 | ||
64 | void (*write_tail)(struct intel_ring_buffer *ring, | 64 | void (*write_tail)(struct intel_ring_buffer *ring, |
65 | u32 value); | 65 | u32 value); |
66 | void (*flush)(struct intel_ring_buffer *ring, | 66 | int __must_check (*flush)(struct intel_ring_buffer *ring, |
67 | u32 invalidate_domains, | 67 | u32 invalidate_domains, |
68 | u32 flush_domains); | 68 | u32 flush_domains); |
69 | int (*add_request)(struct intel_ring_buffer *ring, | 69 | int (*add_request)(struct intel_ring_buffer *ring, |
70 | u32 *seqno); | 70 | u32 *seqno); |
71 | u32 (*get_seqno)(struct intel_ring_buffer *ring); | 71 | u32 (*get_seqno)(struct intel_ring_buffer *ring); |