Commit d9dc34f1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Factor out ilk_update_display_irq() 



Extract the core of ironlake_{enable,disable}_display_irq() into a new
function. We'll have further use for it later.

v2: Warn about invalid mask vs. enable bits (Paulo)

Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 87a02106

drivers/gpu/drm/i915/i915_irq.c

+26 −15
Original line number Diff line number Diff line
@@ -154,35 +154,46 @@ static const u32 hpd_bxt[HPD_NUM_PINS] = { 


static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);



/* For display hotplug interrupt */

void

ironlake_enable_display_irq(struct drm_i915_private *dev_priv, u32 mask)

/**

 * ilk_update_display_irq - update DEIMR

 * @dev_priv: driver private

 * @interrupt_mask: mask of interrupt bits to update

 * @enabled_irq_mask: mask of interrupt bits to enable

 */

static void ilk_update_display_irq(struct drm_i915_private *dev_priv,

				   uint32_t interrupt_mask,

				   uint32_t enabled_irq_mask)

{

	uint32_t new_val;



	assert_spin_locked(&dev_priv->irq_lock);



	WARN_ON(enabled_irq_mask & ~interrupt_mask);



	if (WARN_ON(!intel_irqs_enabled(dev_priv)))

		return;



	if ((dev_priv->irq_mask & mask) != 0) {

		dev_priv->irq_mask &= ~mask;

	new_val = dev_priv->irq_mask;

	new_val &= ~interrupt_mask;

	new_val |= (~enabled_irq_mask & interrupt_mask);



	if (new_val != dev_priv->irq_mask) {

		dev_priv->irq_mask = new_val;

		I915_WRITE(DEIMR, dev_priv->irq_mask);

		POSTING_READ(DEIMR);

	}

}



void

ironlake_disable_display_irq(struct drm_i915_private *dev_priv, u32 mask)

ironlake_enable_display_irq(struct drm_i915_private *dev_priv, u32 mask)

{

	assert_spin_locked(&dev_priv->irq_lock);



	if (WARN_ON(!intel_irqs_enabled(dev_priv)))

		return;



	if ((dev_priv->irq_mask & mask) != mask) {

		dev_priv->irq_mask |= mask;

		I915_WRITE(DEIMR, dev_priv->irq_mask);

		POSTING_READ(DEIMR);

	ilk_update_display_irq(dev_priv, mask, mask);

}



void

ironlake_disable_display_irq(struct drm_i915_private *dev_priv, u32 mask)

{

	ilk_update_display_irq(dev_priv, mask, 0);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE