From: Ville Syrjälä Date: Wed, 13 Apr 2016 18:19:52 +0000 (+0300) Subject: drm/i915: Eliminate loop from VLV irq handler X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~270 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e1cace942ef67d36828daa2d42559f02271897b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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ä Link: http://patchwork.freedesktop.org/patch/msgid/1460571598-24452-7-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson --- 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;