diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-13 21:19:52 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-14 14:45:27 +0300 |
| commit | 1e1cace942ef67d36828daa2d42559f02271897b (patch) | |
| tree | 1ad0b00fd15978d26504735eebe67904699c0b7c /drivers/gpu/drm | |
| parent | a5e485a95c9c4cdd93b4c6dc53eee3bd1e50de11 (diff) | |
drm/i915: Eliminate loop from VLV irq handler
Now that we've dealt with the races in clearing IIR bits via VLV_IER
and the master interrupt enable, we can go ahead aliminate the loop
from the VLV interrupt handler.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-7-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 6c9b3696af3f..948849639021 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1777,7 +1777,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) /* IRQs are synced during runtime_suspend, we don't require a wakeref */ disable_rpm_wakeref_asserts(dev_priv); - while (true) { + do { u32 ier = 0; gt_iir = I915_READ(GTIIR); @@ -1785,7 +1785,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) iir = I915_READ(VLV_IIR); if (gt_iir == 0 && pm_iir == 0 && iir == 0) - goto out; + break; ret = IRQ_HANDLED; @@ -1833,9 +1833,8 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) I915_WRITE(VLV_IER, ier); I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE); POSTING_READ(VLV_MASTER_IER); - } + } while (0); -out: enable_rpm_wakeref_asserts(dev_priv); return ret; |