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

Commit 995e6b3d authored by Egbert Eich's avatar Egbert Eich Committed by Daniel Vetter
Browse files

drm/i915: Mask out the HPD irq bits before setting them individually. 



To disable previously enabled HPD IRQs we need to reset them and
set the enabled ones individually.

Signed-off-by: default avatarEgbert Eich <eich@suse.de>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 821450c6

drivers/gpu/drm/i915/i915_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -2128,9 +2128,11 @@ static void ibx_hpd_irq_setup(struct drm_device *dev) 
	u32 hotplug;



	if (HAS_PCH_IBX(dev)) {

		mask &= ~SDE_HOTPLUG_MASK;

		list_for_each_entry(intel_encoder, &mode_config->encoder_list, base.head)

			mask |= hpd_ibx[intel_encoder->hpd_pin];

	} else {

		mask &= ~SDE_HOTPLUG_MASK_CPT;

		list_for_each_entry(intel_encoder, &mode_config->encoder_list, base.head)

			mask |= hpd_cpt[intel_encoder->hpd_pin];

	}