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: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 536e97381cefeee896e869e84f3e45a2eb9693eb..4840b21c1869405b97d9c6ef39ed8262f25a8fc1 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1442,39 +1442,38 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
 
        spin_lock(&dev_priv->irq_lock);
        for_each_hpd_pin(i) {
-               bool long_hpd;
-
                if (!(hpd[i] & hotplug_trigger))
                        continue;
 
                port = get_port_from_pin(i);
-               if (!port || !dev_priv->hotplug.irq_port[port])
-                       continue;
+               if (port && dev_priv->hotplug.irq_port[port]) {
+                       bool long_hpd;
 
-               if (!HAS_GMCH_DISPLAY(dev_priv)) {
-                       dig_shift = pch_port_to_hotplug_shift(port);
-                       long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
-               } else {
-                       dig_shift = i915_port_to_hotplug_shift(port);
-                       long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
-               }
+                       if (!HAS_GMCH_DISPLAY(dev_priv)) {
+                               dig_shift = pch_port_to_hotplug_shift(port);
+                               long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
+                       } else {
+                               dig_shift = i915_port_to_hotplug_shift(port);
+                               long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
+                       }
 
-               DRM_DEBUG_DRIVER("digital hpd port %c - %s\n", port_name(port),
-                                long_hpd ? "long" : "short");
-               /*
-                * For long HPD pulses we want to have the digital queue happen,
-                * but we still want HPD storm detection to function.
-                */
-               if (long_hpd) {
-                       dev_priv->hotplug.long_port_mask |= (1 << port);
-                       dig_port_mask |= hpd[i];
-               } else {
-                       /* for short HPD just trigger the digital queue */
-                       dev_priv->hotplug.short_port_mask |= (1 << port);
-                       hotplug_trigger &= ~hpd[i];
-               }
+                       DRM_DEBUG_DRIVER("digital hpd port %c - %s\n", port_name(port),
+                                        long_hpd ? "long" : "short");
+                       /*
+                        * For long HPD pulses we want to have the digital queue happen,
+                        * but we still want HPD storm detection to function.
+                        */
+                       if (long_hpd) {
+                               dev_priv->hotplug.long_port_mask |= (1 << port);
+                               dig_port_mask |= hpd[i];
+                       } else {
+                               /* for short HPD just trigger the digital queue */
+                               dev_priv->hotplug.short_port_mask |= (1 << port);
+                               hotplug_trigger &= ~hpd[i];
+                       }
 
-               queue_dig = true;
+                       queue_dig = true;
+               }
        }
 
        for_each_hpd_pin(i) {