Commit b0c29a33 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter

drm/i915: reduce indent in intel_hpd_irq_handler

Continue to loop early if there's nothing to do. No functional changes.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 369712e8
...@@ -1442,36 +1442,39 @@ static void intel_hpd_irq_handler(struct drm_device *dev, ...@@ -1442,36 +1442,39 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
spin_lock(&dev_priv->irq_lock); spin_lock(&dev_priv->irq_lock);
for (i = 1; i < HPD_NUM_PINS; i++) { for (i = 1; i < HPD_NUM_PINS; i++) {
bool long_hpd;
if (!(hpd[i] & hotplug_trigger)) if (!(hpd[i] & hotplug_trigger))
continue; continue;
port = get_port_from_pin(i); port = get_port_from_pin(i);
if (port && dev_priv->hpd_irq_port[port]) { if (!port || !dev_priv->hpd_irq_port[port])
bool long_hpd; continue;
if (!HAS_GMCH_DISPLAY(dev_priv)) { if (!HAS_GMCH_DISPLAY(dev_priv)) {
dig_shift = pch_port_to_hotplug_shift(port); dig_shift = pch_port_to_hotplug_shift(port);
long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT; long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
} else { } else {
dig_shift = i915_port_to_hotplug_shift(port); dig_shift = i915_port_to_hotplug_shift(port);
long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT; long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
} }
DRM_DEBUG_DRIVER("digital hpd port %c - %s\n", DRM_DEBUG_DRIVER("digital hpd port %c - %s\n", port_name(port),
port_name(port), long_hpd ? "long" : "short");
long_hpd ? "long" : "short"); /*
/* for long HPD pulses we want to have the digital queue happen, * For long HPD pulses we want to have the digital queue happen,
but we still want HPD storm detection to function. */ * but we still want HPD storm detection to function.
if (long_hpd) { */
dev_priv->long_hpd_port_mask |= (1 << port); if (long_hpd) {
dig_port_mask |= hpd[i]; dev_priv->long_hpd_port_mask |= (1 << port);
} else { dig_port_mask |= hpd[i];
/* for short HPD just trigger the digital queue */ } else {
dev_priv->short_hpd_port_mask |= (1 << port); /* for short HPD just trigger the digital queue */
hotplug_trigger &= ~hpd[i]; dev_priv->short_hpd_port_mask |= (1 << port);
} hotplug_trigger &= ~hpd[i];
queue_dig = true;
} }
queue_dig = true;
} }
for (i = 1; i < HPD_NUM_PINS; i++) { for (i = 1; i < HPD_NUM_PINS; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment