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

drm/i915: put back the indent in intel_hpd_irq_handler

In an unfortunate back and forth stepping, retract the earlier change to
reduce indent. This is to make 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 641a969e
...@@ -1442,14 +1442,12 @@ static void intel_hpd_irq_handler(struct drm_device *dev, ...@@ -1442,14 +1442,12 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
spin_lock(&dev_priv->irq_lock); spin_lock(&dev_priv->irq_lock);
for_each_hpd_pin(i) { for_each_hpd_pin(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->hotplug.irq_port[port]) if (port && dev_priv->hotplug.irq_port[port]) {
continue; bool long_hpd;
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);
...@@ -1476,6 +1474,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev, ...@@ -1476,6 +1474,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
queue_dig = true; queue_dig = true;
} }
}
for_each_hpd_pin(i) { for_each_hpd_pin(i) {
if (!(hpd[i] & hotplug_trigger)) if (!(hpd[i] & hotplug_trigger))
......
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