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

drm/i915: merge the two hpd loops in intel_hpd_irq_handler to one 

Nothing in the two consecutive loops over hpd pins depends on state in a
larger context than the single hpd pin. If we skip the rest of the loop
on short hpd pulses, we can merge the two loops into one.

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>
This commit is contained in:
Jani Nikula 2015-05-28 15:43:51 +03:00 committed by Daniel Vetter
parent ab68d5bb0b
commit 9ace043310
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1463,22 +1463,17 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
* 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.
*/ */
queue_dig = true;
if (long_hpd) { if (long_hpd) {
dev_priv->hotplug.long_port_mask |= (1 << port); dev_priv->hotplug.long_port_mask |= (1 << port);
/* FIXME: this can be simplified. */
dig_port_mask |= hpd[i]; dig_port_mask |= hpd[i];
} else { } else {
/* for short HPD just trigger the digital queue */ /* for short HPD just trigger the digital queue */
dev_priv->hotplug.short_port_mask |= (1 << port); dev_priv->hotplug.short_port_mask |= (1 << port);
hotplug_trigger &= ~hpd[i]; continue;
} }
queue_dig = true;
} }
}
for_each_hpd_pin(i) {
if (!(hpd[i] & hotplug_trigger))
continue;
if (dev_priv->hotplug.stats[i].state == HPD_DISABLED) { if (dev_priv->hotplug.stats[i].state == HPD_DISABLED) {
/* /*