drm/i915: Enable hotplug retry

Right now we are aware of two cases that needs another hotplug retry:
- Unpowered type-c dongles
- HDMI slow unplug

Both have a complete explanation in the code to schedule another run
of the hotplug handler.

It could have more checks to just trigger the retry in those two
specific cases but why would sink signal a long pulse if there is
no change? Also the drawback of running the hotplug handler again
is really low and that could fix another cases that we are not
aware.

Also retrying for old DP ports(non-DDI) to make it consistent and not
cause CI failures if those systems are connected to chamelium boards
that will be used to simulate the issues reported in here.

v2: Also retrying for old DP ports(non-DDI)(Imre)

v4: Renamed INTEL_HOTPLUG_NOCHANGE to INTEL_HOTPLUG_UNCHANGED to keep
it consistent(Rodrigo)

Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712005343.24571-2-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index c89d0c7543dc21dd5770a546d7a0531c31675e7e..18bc0f2690c91278600a587fc250ec8a8dcb4332 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4075,6 +4075,7 @@ intel_ddi_hotplug(struct intel_encoder *encoder,
                  struct intel_connector *connector,
                  bool irq_received)
 {
+       struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
        struct drm_modeset_acquire_ctx ctx;
        enum intel_hotplug_state state;
        int ret;
@@ -4101,6 +4102,26 @@ intel_ddi_hotplug(struct intel_encoder *encoder,
        drm_modeset_acquire_fini(&ctx);
        WARN(ret, "Acquiring modeset locks failed with %i\n", ret);
 
+       /*
+        * Unpowered type-c dongles can take some time to boot and be
+        * responsible, so here giving some time to those dongles to power up
+        * and then retrying the probe.
+        *
+        * On many platforms the HDMI live state signal is known to be
+        * unreliable, so we can't use it to detect if a sink is connected or
+        * not. Instead we detect if it's connected based on whether we can
+        * read the EDID or not. That in turn has a problem during disconnect,
+        * since the HPD interrupt may be raised before the DDC lines get
+        * disconnected (due to how the required length of DDC vs. HPD
+        * connector pins are specified) and so we'll still be able to get a
+        * valid EDID. To solve this schedule another detection cycle if this
+        * time around we didn't detect any change in the sink's connection
+        * status.
+        */
+       if (state == INTEL_HOTPLUG_UNCHANGED && irq_received &&
+           !dig_port->dp.is_mst)
+               state = INTEL_HOTPLUG_RETRY;
+
        return state;
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 14c191d9c147ff486c11dec4031bd54038498535..0eb5d66f87a7bc73e96df45cf34ac6ae59c1749a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4891,6 +4891,13 @@ intel_dp_hotplug(struct intel_encoder *encoder,
        drm_modeset_acquire_fini(&ctx);
        WARN(ret, "Acquiring modeset locks failed with %i\n", ret);
 
+       /*
+        * Keeping it consistent with intel_ddi_hotplug() and
+        * intel_hdmi_hotplug().
+        */
+       if (state == INTEL_HOTPLUG_UNCHANGED && irq_received)
+               state = INTEL_HOTPLUG_RETRY;
+
        return state;
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 098ea2c5d83174c8e7e6219f369e53a6c01d09a6..9bf28de10401ad902e67557ec0c5576fac3dd13f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3126,6 +3126,32 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                DRM_DEBUG_KMS("CEC notifier get failed\n");
 }
 
+static enum intel_hotplug_state
+intel_hdmi_hotplug(struct intel_encoder *encoder,
+                  struct intel_connector *connector, bool irq_received)
+{
+       enum intel_hotplug_state state;
+
+       state = intel_encoder_hotplug(encoder, connector, irq_received);
+
+       /*
+        * On many platforms the HDMI live state signal is known to be
+        * unreliable, so we can't use it to detect if a sink is connected or
+        * not. Instead we detect if it's connected based on whether we can
+        * read the EDID or not. That in turn has a problem during disconnect,
+        * since the HPD interrupt may be raised before the DDC lines get
+        * disconnected (due to how the required length of DDC vs. HPD
+        * connector pins are specified) and so we'll still be able to get a
+        * valid EDID. To solve this schedule another detection cycle if this
+        * time around we didn't detect any change in the sink's connection
+        * status.
+        */
+       if (state == INTEL_HOTPLUG_UNCHANGED && irq_received)
+               state = INTEL_HOTPLUG_RETRY;
+
+       return state;
+}
+
 void intel_hdmi_init(struct drm_i915_private *dev_priv,
                     i915_reg_t hdmi_reg, enum port port)
 {
@@ -3149,7 +3175,7 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
                         &intel_hdmi_enc_funcs, DRM_MODE_ENCODER_TMDS,
                         "HDMI %c", port_name(port));
 
-       intel_encoder->hotplug = intel_encoder_hotplug;
+       intel_encoder->hotplug = intel_hdmi_hotplug;
        intel_encoder->compute_config = intel_hdmi_compute_config;
        if (HAS_PCH_SPLIT(dev_priv)) {
                intel_encoder->disable = pch_disable_hdmi;