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 23:22:56 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-11 21:43:57 +0100
commit01a03331e5fe91861937f8b8e72c259f5e9eae67 (patch)
tree04907482e03da7bafae301778104a13610a38076 /drivers/gpu/drm/i915/intel_ringbuffer.h
parentdrm/i915/debugfs: Show the per-ring IMR (diff)
downloadlinux-01a03331e5fe91861937f8b8e72c259f5e9eae67.tar.xz
linux-01a03331e5fe91861937f8b8e72c259f5e9eae67.zip
drm/i915/ringbuffer: Simplify the ring irq refcounting
... and move it under the spinlock to gain the appropriate memory barriers. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32752 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.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 9b134b8643cb..6b1d9a5a7d07 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -55,11 +55,11 @@ struct intel_ring_buffer {
int effective_size;
struct intel_hw_status_page status_page;
+ u32 irq_refcount;
u32 irq_mask;
u32 irq_seqno; /* last seq seem at irq time */
u32 waiting_seqno;
u32 sync_seqno[I915_NUM_RINGS-1];
- atomic_t irq_refcount;
bool __must_check (*irq_get)(struct intel_ring_buffer *ring);
void (*irq_put)(struct intel_ring_buffer *ring);