[Intel-gfx] [PATCH 1/2] drm/i915/hotplug: Move iteration over connectors to other function

[José Roberto de Souza]

The next patch will need to a second iteration over connectors so
moving it to a function, no behavior changes intended here.

While at it moving intel_connector and intel_encoder to inside of the
block that actually uses it.

Cc: Imre Deak <imre.d...@intel.com>
Signed-off-by: José Roberto de Souza <jose.so...@intel.com>
---
 drivers/gpu/drm/i915/intel_hotplug.c | 52 ++++++++++++++++++----------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c 
b/drivers/gpu/drm/i915/intel_hotplug.c
index b8937c788f03..72e0203bcbb2 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -342,6 +342,37 @@ static void i915_digport_work_func(struct work_struct 
*work)
        }
 }
 
+static bool
+i915_hotplug_iterate(struct drm_device *dev, u32 hpd_event_bits)
+{
+       struct drm_connector_list_iter conn_iter;
+       struct drm_connector *connector;
+       bool changed = 0;
+
+       drm_connector_list_iter_begin(dev, &conn_iter);
+       drm_for_each_connector_iter(connector, &conn_iter) {
+               struct intel_connector *intel_connector;
+               struct intel_encoder *intel_encoder;
+
+               intel_connector = to_intel_connector(connector);
+               intel_encoder = intel_connector->encoder;
+
+               if (!intel_encoder)
+                       continue;
+
+               if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
+                       DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug 
event.\n",
+                                     connector->name, intel_encoder->hpd_pin);
+
+                       changed |= intel_encoder->hotplug(intel_encoder,
+                                                         intel_connector);
+               }
+       }
+       drm_connector_list_iter_end(&conn_iter);
+
+       return changed;
+}
+
 /*
  * Handle hotplug events outside the interrupt handler proper.
  */
@@ -350,11 +381,7 @@ static void i915_hotplug_work_func(struct work_struct 
*work)
        struct drm_i915_private *dev_priv =
                container_of(work, struct drm_i915_private, 
hotplug.hotplug_work);
        struct drm_device *dev = &dev_priv->drm;
-       struct intel_connector *intel_connector;
-       struct intel_encoder *intel_encoder;
-       struct drm_connector *connector;
-       struct drm_connector_list_iter conn_iter;
-       bool changed = false;
+       bool changed;
        u32 hpd_event_bits;
 
        mutex_lock(&dev->mode_config.mutex);
@@ -370,21 +397,8 @@ static void i915_hotplug_work_func(struct work_struct 
*work)
 
        spin_unlock_irq(&dev_priv->irq_lock);
 
-       drm_connector_list_iter_begin(dev, &conn_iter);
-       drm_for_each_connector_iter(connector, &conn_iter) {
-               intel_connector = to_intel_connector(connector);
-               if (!intel_connector->encoder)
-                       continue;
-               intel_encoder = intel_connector->encoder;
-               if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
-                       DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug 
event.\n",
-                                     connector->name, intel_encoder->hpd_pin);
+       changed = i915_hotplug_iterate(dev, hpd_event_bits);
 
-                       changed |= intel_encoder->hotplug(intel_encoder,
-                                                         intel_connector);
-               }
-       }
-       drm_connector_list_iter_end(&conn_iter);
        mutex_unlock(&dev->mode_config.mutex);
 
        if (changed)
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx