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

drm/i915: add for_each_hpd_pin to iterate over hotplug pins

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 623e01e5
...@@ -217,6 +217,9 @@ enum hpd_pin { ...@@ -217,6 +217,9 @@ enum hpd_pin {
HPD_NUM_PINS HPD_NUM_PINS
}; };
#define for_each_hpd_pin(__pin) \
for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
struct i915_hotplug { struct i915_hotplug {
struct work_struct hotplug_work; struct work_struct hotplug_work;
......
...@@ -1441,7 +1441,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev, ...@@ -1441,7 +1441,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
hotplug_trigger, dig_hotplug_reg); hotplug_trigger, dig_hotplug_reg);
spin_lock(&dev_priv->irq_lock); spin_lock(&dev_priv->irq_lock);
for (i = 1; i < HPD_NUM_PINS; i++) { for_each_hpd_pin(i) {
bool long_hpd; bool long_hpd;
if (!(hpd[i] & hotplug_trigger)) if (!(hpd[i] & hotplug_trigger))
...@@ -1477,7 +1477,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev, ...@@ -1477,7 +1477,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
queue_dig = true; queue_dig = true;
} }
for (i = 1; i < HPD_NUM_PINS; i++) { for_each_hpd_pin(i) {
if (hpd[i] & hotplug_trigger && if (hpd[i] & hotplug_trigger &&
dev_priv->hotplug.stats[i].state == HPD_DISABLED) { dev_priv->hotplug.stats[i].state == HPD_DISABLED) {
/* /*
...@@ -4292,7 +4292,7 @@ static void intel_hpd_irq_reenable_work(struct work_struct *work) ...@@ -4292,7 +4292,7 @@ static void intel_hpd_irq_reenable_work(struct work_struct *work)
intel_runtime_pm_get(dev_priv); intel_runtime_pm_get(dev_priv);
spin_lock_irq(&dev_priv->irq_lock); spin_lock_irq(&dev_priv->irq_lock);
for (i = (HPD_NONE + 1); i < HPD_NUM_PINS; i++) { for_each_hpd_pin(i) {
struct drm_connector *connector; struct drm_connector *connector;
if (dev_priv->hotplug.stats[i].state != HPD_DISABLED) if (dev_priv->hotplug.stats[i].state != HPD_DISABLED)
...@@ -4450,7 +4450,7 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) ...@@ -4450,7 +4450,7 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
struct drm_connector *connector; struct drm_connector *connector;
int i; int i;
for (i = 1; i < HPD_NUM_PINS; i++) { for_each_hpd_pin(i) {
dev_priv->hotplug.stats[i].count = 0; dev_priv->hotplug.stats[i].count = 0;
dev_priv->hotplug.stats[i].state = HPD_ENABLED; dev_priv->hotplug.stats[i].state = HPD_ENABLED;
} }
......
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