diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-11 22:12:46 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-13 12:40:57 +0200 |
| commit | 6a848ccb800f5330ca368cd804795b7ce644e36c (patch) | |
| tree | 5d034820c235ca1e3be7ea83f52ca1aec3b5e9fd /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | 1500f7ea06858819abcf8eec8f952e2f9281c610 (diff) | |
| download | olio-linux-3.10-6a848ccb800f5330ca368cd804795b7ce644e36c.tar.xz olio-linux-3.10-6a848ccb800f5330ca368cd804795b7ce644e36c.zip | |
drm/i915: rip out ring->irq_mask
We only ever enable/disable one interrupt (namely user_interrupts and
pipe_notify), so we don't need to track the interrupt masking state.
Also rename irq_enable to irq_enable_mask, now that it won't collide -
beforehand both a irq_mask and irq_enable_mask would have looked a bit
strange.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 3488a5a127d..06a66adf69c 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -58,8 +58,7 @@ struct intel_ring_buffer { spinlock_t irq_lock; u32 irq_refcount; - u32 irq_mask; - u32 irq_enable; /* IRQs enabled for this ring */ + u32 irq_enable_mask; /* bitmask to enable ring interrupt */ u32 irq_seqno; /* last seq seem at irq time */ u32 trace_irq_seqno; u32 waiting_seqno; |