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

Commit 333a8204 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: don't disable/reenable IVB error interrupts when not needed 



If the error interrupts are already disabled, don't disable and
reenable them. This is going to be needed when we're in PC8+, where
all the interrupts are disabled so we won't risk re-enabling
DE_ERR_INT_IVB.

v2: Use dev_priv->irq_mask (Chris)

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 605cd25b

drivers/gpu/drm/i915/i915_irq.c

+5 −2
Original line number Diff line number Diff line
@@ -1373,6 +1373,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	u32 de_iir, gt_iir, de_ier, sde_ier = 0;

	irqreturn_t ret = IRQ_NONE;

	bool err_int_reenable = false;



	atomic_inc(&dev_priv->irq_received);
@@ -1401,6 +1402,8 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
	 * handler. */

	if (IS_HASWELL(dev)) {

		spin_lock(&dev_priv->irq_lock);

		err_int_reenable = ~dev_priv->irq_mask & DE_ERR_INT_IVB;

		if (err_int_reenable)

			ironlake_disable_display_irq(dev_priv, DE_ERR_INT_IVB);

		spin_unlock(&dev_priv->irq_lock);

	}
@@ -1437,7 +1440,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) 
		}

	}



	if (IS_HASWELL(dev)) {

	if (err_int_reenable) {

		spin_lock(&dev_priv->irq_lock);

		if (ivb_can_enable_err_int(dev))

			ironlake_enable_display_irq(dev_priv, DE_ERR_INT_IVB);