openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jani Nikula 2015-05-27 15:03:41 +03:00 committed by Daniel Vetter
parent 369712e894
commit b0c29a33fc
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/i915/i915_irq.c
View File

@ -1442,12 +1442,14 @@ 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);
@ -1457,11 +1459,12 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
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, /*
but we still want HPD storm detection to function. */ * For long HPD pulses we want to have the digital queue happen,
* but we still want HPD storm detection to function.
*/
if (long_hpd) { if (long_hpd) {
dev_priv->long_hpd_port_mask |= (1 << port); dev_priv->long_hpd_port_mask |= (1 << port);
dig_port_mask |= hpd[i]; dig_port_mask |= hpd[i];
@ -1470,9 +1473,9 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
dev_priv->short_hpd_port_mask |= (1 << port); dev_priv->short_hpd_port_mask |= (1 << port);
hotplug_trigger &= ~hpd[i]; 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++) {
if (hpd[i] & hotplug_trigger && if (hpd[i] & hotplug_trigger &&