[Intel-gfx] [PATCH v2 5/5] drm/i915: Don't change the status of forced connectors during HPD poll detect

[Imre Deak]

As described in the previous patch a connector shouldn't change its
status while it's forced to a connected/disconnected state. This can
still happen while running the connector detect function to account for
lost HPD events in a low-power state.

Fix this by reusing the connector detect function which handles a
hotplug event and prevents updating the status for forced connectors as
expected.

Testcase: igt@kms_force_connector_basic@force-connector-state
Signed-off-by: Imre Deak <imre.d...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hotplug.c | 57 ++++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c 
b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 1f6fa3f994feb..e8562f6f8bb44 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -260,9 +260,8 @@ static void intel_hpd_irq_storm_reenable_work(struct 
work_struct *work)
        intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
 }
 
-enum intel_hotplug_state
-intel_encoder_hotplug(struct intel_encoder *encoder,
-                     struct intel_connector *connector)
+static enum intel_hotplug_state
+intel_hotplug_detect_connector(struct intel_connector *connector)
 {
        struct drm_device *dev = connector->base.dev;
        enum drm_connector_status old_status;
@@ -294,6 +293,13 @@ intel_encoder_hotplug(struct intel_encoder *encoder,
        return INTEL_HOTPLUG_UNCHANGED;
 }
 
+enum intel_hotplug_state
+intel_encoder_hotplug(struct intel_encoder *encoder,
+                     struct intel_connector *connector)
+{
+       return intel_hotplug_detect_connector(connector);
+}
+
 static bool intel_encoder_has_hpd_pulse(struct intel_encoder *encoder)
 {
        return intel_encoder_is_dig_port(encoder) &&
@@ -634,6 +640,49 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
        spin_unlock_irq(&dev_priv->irq_lock);
 }
 
+static void i915_hpd_poll_detect_connectors(struct drm_i915_private *i915)
+{
+       struct drm_connector_list_iter conn_iter;
+       struct intel_connector *connector;
+       struct intel_connector *first_changed_connector = NULL;
+       int changed = 0;
+
+       mutex_lock(&i915->drm.mode_config.mutex);
+
+       if (!i915->drm.mode_config.poll_enabled)
+               goto out;
+
+       drm_connector_list_iter_begin(&i915->drm, &conn_iter);
+       for_each_intel_connector_iter(connector, &conn_iter) {
+               if (!(connector->base.polled & DRM_CONNECTOR_POLL_HPD))
+                       continue;
+
+               if (intel_hotplug_detect_connector(connector) != 
INTEL_HOTPLUG_CHANGED)
+                       continue;
+
+               changed++;
+
+               if (changed == 1) {
+                       drm_connector_get(&connector->base);
+                       first_changed_connector = connector;
+               }
+       }
+       drm_connector_list_iter_end(&conn_iter);
+
+out:
+       mutex_unlock(&i915->drm.mode_config.mutex);
+
+       if (!changed)
+               return;
+
+       if (changed == 1)
+               
drm_kms_helper_connector_hotplug_event(&first_changed_connector->base);
+       else
+               drm_kms_helper_hotplug_event(&i915->drm);
+
+       drm_connector_put(&first_changed_connector->base);
+}
+
 static void i915_hpd_poll_init_work(struct work_struct *work)
 {
        struct drm_i915_private *dev_priv =
@@ -687,7 +736,7 @@ static void i915_hpd_poll_init_work(struct work_struct 
*work)
         * in the middle of disabling polling
         */
        if (!enabled) {
-               drm_helper_hpd_irq_event(&dev_priv->drm);
+               i915_hpd_poll_detect_connectors(dev_priv);
 
                intel_display_power_put(dev_priv,
                                        POWER_DOMAIN_DISPLAY_CORE,
-- 
2.37.2