Commit 3bda3b66 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Clean up gen3 hotplug irq setup 



For the "always on/unmasked" interrupts we initialize
dev_priv->irq_mask first, then enable_mask. Follow the
same order for the hotplug interrupt so that things are
a bit less confusing.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240927143545.8665-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 8f6b856e

drivers/gpu/drm/i915/i915_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -1065,10 +1065,10 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv) 
		I915_USER_INTERRUPT;



	if (I915_HAS_HOTPLUG(dev_priv)) {

		/* Enable in IER... */

		enable_mask |= I915_DISPLAY_PORT_INTERRUPT;

		/* and unmask in IMR */

		dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;

		/* Enable in IER... */

		enable_mask |= I915_DISPLAY_PORT_INTERRUPT;

	}



	GEN3_IRQ_INIT(uncore, GEN2_, dev_priv->irq_mask, enable_mask);