[PATCH 05/10] drm/i915: Roll out drm_for_each_connector in intel_hotplug.c

[Daniel Vetter]

Just prep work to for the revamped connector_list locking.

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 drivers/gpu/drm/i915/intel_hotplug.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c 
b/drivers/gpu/drm/i915/intel_hotplug.c
index 38eeca7a6e72..e537c03ef6ee 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -145,16 +145,16 @@ static bool intel_hpd_irq_storm_detect(struct 
drm_i915_private *dev_priv,
 static void intel_hpd_irq_storm_disable(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct drm_mode_config *mode_config = &dev->mode_config;
        struct intel_connector *intel_connector;
        struct intel_encoder *intel_encoder;
        struct drm_connector *connector;
        enum hpd_pin pin;
        bool hpd_disabled = false;
+       struct drm_connector_iter iter;

        assert_spin_locked(&dev_priv->irq_lock);

-       list_for_each_entry(connector, &mode_config->connector_list, head) {
+       drm_for_each_connector(connector, dev, iter) {
                if (connector->polled != DRM_CONNECTOR_POLL_HPD)
                        continue;

@@ -192,7 +192,7 @@ static void intel_hpd_irq_storm_reenable_work(struct 
work_struct *work)
                container_of(work, typeof(*dev_priv),
                             hotplug.reenable_work.work);
        struct drm_device *dev = dev_priv->dev;
-       struct drm_mode_config *mode_config = &dev->mode_config;
+       struct drm_connector_iter iter;
        int i;

        intel_runtime_pm_get(dev_priv);
@@ -206,7 +206,7 @@ static void intel_hpd_irq_storm_reenable_work(struct 
work_struct *work)

                dev_priv->hotplug.stats[i].state = HPD_ENABLED;

-               list_for_each_entry(connector, &mode_config->connector_list, 
head) {
+               drm_for_each_connector(connector, dev, iter) {
                        struct intel_connector *intel_connector = 
to_intel_connector(connector);

                        if (intel_connector->encoder->hpd_pin == i) {
@@ -309,6 +309,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
        struct drm_connector *connector;
        bool changed = false;
        u32 hpd_event_bits;
+       struct drm_connector_iter iter;

        mutex_lock(&mode_config->mutex);
        DRM_DEBUG_KMS("running encoder hotplug functions\n");
@@ -323,7 +324,7 @@ static void i915_hotplug_work_func(struct work_struct *work)

        spin_unlock_irq(&dev_priv->irq_lock);

-       list_for_each_entry(connector, &mode_config->connector_list, head) {
+       drm_for_each_connector(connector, dev, iter) {
                intel_connector = to_intel_connector(connector);
                if (!intel_connector->encoder)
                        continue;
@@ -456,15 +457,16 @@ void intel_hpd_irq_handler(struct drm_i915_private 
*dev_priv,
 void intel_hpd_init(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct drm_mode_config *mode_config = &dev->mode_config;
        struct drm_connector *connector;
+       struct drm_connector_iter iter;
        int i;

        for_each_hpd_pin(i) {
                dev_priv->hotplug.stats[i].count = 0;
                dev_priv->hotplug.stats[i].state = HPD_ENABLED;
        }
-       list_for_each_entry(connector, &mode_config->connector_list, head) {
+
+       drm_for_each_connector(connector, dev, iter) {
                struct intel_connector *intel_connector = 
to_intel_connector(connector);
                connector->polled = intel_connector->polled;

-- 
2.8.1