Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1cace9 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent a5e485a9

drivers/gpu/drm/i915/i915_irq.c

+3 −4
Original line number Diff line number Diff line
@@ -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;