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

Commit 641a969e authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: simplify conditions for skipping the 2nd hpd loop iterations 



Multiple positive and negative checks for hpd[i] & hotplug_trigger gets
hard to read. Simplify. This should make follow-up patches merging the
two loops easier. No functional changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c91711f9

drivers/gpu/drm/i915/i915_irq.c

+5 −4
Original line number Diff line number Diff line
@@ -1478,8 +1478,10 @@ static void intel_hpd_irq_handler(struct drm_device *dev, 
	}



	for_each_hpd_pin(i) {

		if (hpd[i] & hotplug_trigger &&

		    dev_priv->hotplug.stats[i].state == HPD_DISABLED) {

		if (!(hpd[i] & hotplug_trigger))

			continue;



		if (dev_priv->hotplug.stats[i].state == HPD_DISABLED) {

			/*

			 * On GMCH platforms the interrupt mask bits only

			 * prevent irq generation, not the setting of the
@@ -1493,8 +1495,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev, 
			continue;

		}



		if (!(hpd[i] & hotplug_trigger) ||

		    dev_priv->hotplug.stats[i].state != HPD_ENABLED)

		if (dev_priv->hotplug.stats[i].state != HPD_ENABLED)

			continue;



		if (!(dig_port_mask & hpd[i])) {