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

drm/i915: simplify conditions for skipping the 2nd hpd loop iterations 

Multiple positive and negative checks for hpd[i] & hotplug_trigger gets
hard to read. Simplify. This should make follow-up patches 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>
This commit is contained in:
Jani Nikula 2015-05-28 15:43:49 +03:00 committed by Daniel Vetter
parent c91711f93f
commit 641a969eff
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1478,8 +1478,10 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
}
for_each_hpd_pin(i) {
if (hpd[i] & hotplug_trigger &&
dev_priv->hotplug.stats[i].state == HPD_DISABLED) {
if (!(hpd[i] & hotplug_trigger))
continue;
if (dev_priv->hotplug.stats[i].state == HPD_DISABLED) {
/*
* On GMCH platforms the interrupt mask bits only
* prevent irq generation, not the setting of the
@ -1493,8 +1495,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
continue;
}
if (!(hpd[i] & hotplug_trigger) ||
dev_priv->hotplug.stats[i].state != HPD_ENABLED)
if (dev_priv->hotplug.stats[i].state != HPD_ENABLED)
continue;
if (!(dig_port_mask & hpd[i])) {