drm/i915: Add support for retrying hotplug

BugLink: http://bugs.launchpad.net/bugs/1835001
There is some scenarios that we are aware that sink probe can fail,
so lets add the infrastructure to let hotplug() hook to request
another probe after some time.

v2: Handle shared HPD pins (Imre)
v3: Rebased
v4: Renamed INTEL_HOTPLUG_NOCHANGE to INTEL_HOTPLUG_UNCHANGED to keep
it consistent(Rodrigo)
v5: Making the working queue used explicit through all the callers to
hotplug_work (Ville)

Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712005343.24571-1-jose.souza@intel.com
(backported from commit 3944709df8e9298225fc2b29e53ee8e6f4b26618
git://anongit.freedesktop.org/drm-intel)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 40a61ef9aac18bdee413df26a9ac6eb9b6a257aa..8677473f50114938d75222dfa7ae4fa5e12c5b04 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4606,7 +4606,7 @@ static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
         */
        synchronize_irq(dev_priv->drm.irq);
        flush_work(&dev_priv->hotplug.dig_port_work);
-       flush_work(&dev_priv->hotplug.hotplug_work);
+       flush_delayed_work(&dev_priv->hotplug.hotplug_work);
 
        seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);
        seq_printf(m, "Detected: %s\n",

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4cc107a3079fbfa3b8211e0d1c8e6a982f10e2e0..63fe15727996e9c5245574751f5cb8324eb9ba60 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -152,7 +152,7 @@ enum hpd_pin {
 #define HPD_STORM_DEFAULT_THRESHOLD 50
 
 struct i915_hotplug {
-       struct work_struct hotplug_work;
+       struct delayed_work hotplug_work;
 
        struct {
                unsigned long last_jiffies;
@@ -164,6 +164,7 @@ struct i915_hotplug {
                } state;
        } stats[HPD_NUM_PINS];
        u32 event_bits;
+       u32 retry_bits;
        struct delayed_work reenable_work;
 
        u32 long_port_mask;

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 7edce1b7b348e0d8301a47aa3a7e7ba25da3d142..6841ede417021b4d18692a80ce4eea00bea0cbd6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3971,14 +3971,16 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder,
        return modeset_pipe(&crtc->base, ctx);
 }
 
-static bool intel_ddi_hotplug(struct intel_encoder *encoder,
-                             struct intel_connector *connector)
+static enum intel_hotplug_state
+intel_ddi_hotplug(struct intel_encoder *encoder,
+                 struct intel_connector *connector,
+                 bool irq_received)
 {
        struct drm_modeset_acquire_ctx ctx;
-       bool changed;
+       enum intel_hotplug_state state;
        int ret;
 
-       changed = intel_encoder_hotplug(encoder, connector);
+       state = intel_encoder_hotplug(encoder, connector, irq_received);
 
        drm_modeset_acquire_init(&ctx, 0);
 
@@ -4000,7 +4002,7 @@ static bool intel_ddi_hotplug(struct intel_encoder *encoder,
        drm_modeset_acquire_fini(&ctx);
        WARN(ret, "Acquiring modeset locks failed with %i\n", ret);
 
-       return changed;
+       return state;
 }
 
 static struct intel_connector *

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 21c6016ccba5be3357943f80060babbf9985da51..bbd1847e0b2eb07480aabd36846c15a66818bd59 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4627,14 +4627,16 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
  * retrain the link to get a picture. That's in case no
  * userspace component reacted to intermittent HPD dip.
  */
-static bool intel_dp_hotplug(struct intel_encoder *encoder,
-                            struct intel_connector *connector)
+static enum intel_hotplug_state
+intel_dp_hotplug(struct intel_encoder *encoder,
+                struct intel_connector *connector,
+                bool irq_received)
 {
        struct drm_modeset_acquire_ctx ctx;
-       bool changed;
+       enum intel_hotplug_state state;
        int ret;
 
-       changed = intel_encoder_hotplug(encoder, connector);
+       state = intel_encoder_hotplug(encoder, connector, irq_received);
 
        drm_modeset_acquire_init(&ctx, 0);
 
@@ -4653,7 +4655,7 @@ static bool intel_dp_hotplug(struct intel_encoder *encoder,
        drm_modeset_acquire_fini(&ctx);
        WARN(ret, "Acquiring modeset locks failed with %i\n", ret);
 
-       return changed;
+       return state;
 }
 
 static void intel_dp_check_service_irq(struct intel_dp *intel_dp)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index abd487da3e9f88b7ce0c50bf9b97807ab60b02cb..2f1d407adbbb2af39b82cf0b6a5e322cc8c274f0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -221,14 +221,21 @@ struct intel_fbdev {
        struct mutex hpd_lock;
 };
 
+enum intel_hotplug_state {
+       INTEL_HOTPLUG_UNCHANGED,
+       INTEL_HOTPLUG_CHANGED,
+       INTEL_HOTPLUG_RETRY,
+};
+
 struct intel_encoder {
        struct drm_encoder base;
 
        enum intel_output_type type;
        enum port port;
        unsigned int cloneable;
-       bool (*hotplug)(struct intel_encoder *encoder,
-                       struct intel_connector *connector);
+       enum intel_hotplug_state (*hotplug)(struct intel_encoder *encoder,
+                                           struct intel_connector *connector,
+                                           bool irq_received);
        enum intel_output_type (*compute_output_type)(struct intel_encoder *,
                                                      struct intel_crtc_state *,
                                                      struct drm_connector_state *);
@@ -1921,8 +1928,9 @@ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
 void intel_dvo_init(struct drm_i915_private *dev_priv);
 /* intel_hotplug.c */
 void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
-bool intel_encoder_hotplug(struct intel_encoder *encoder,
-                          struct intel_connector *connector);
+enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
+                                              struct intel_connector *connector,
+                                              bool irq_received);
 
 /* legacy fbdev emulation in intel_fbdev.c */
 #ifdef CONFIG_DRM_FBDEV_EMULATION

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index e24174d08fedb55ca4619e61cb96570deab6bc52..cc44d57b91d1afb6d30dca98328468de5a710ca5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -112,6 +112,7 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
 
 #define HPD_STORM_DETECT_PERIOD                1000
 #define HPD_STORM_REENABLE_DELAY       (2 * 60 * 1000)
+#define HPD_RETRY_DELAY                        1000
 
 /**
  * intel_hpd_irq_storm_detect - gather stats and detect HPD IRQ storm on a pin
@@ -265,8 +266,10 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
        intel_runtime_pm_put(dev_priv);
 }
 
-bool intel_encoder_hotplug(struct intel_encoder *encoder,
-                          struct intel_connector *connector)
+enum intel_hotplug_state
+intel_encoder_hotplug(struct intel_encoder *encoder,
+                     struct intel_connector *connector,
+                     bool irq_received)
 {
        struct drm_device *dev = connector->base.dev;
        enum drm_connector_status old_status;
@@ -278,7 +281,7 @@ bool intel_encoder_hotplug(struct intel_encoder *encoder,
                drm_helper_probe_detect(&connector->base, NULL, false);
 
        if (old_status == connector->base.status)
-               return false;
+               return INTEL_HOTPLUG_UNCHANGED;
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",
                      connector->base.base.id,
@@ -286,7 +289,7 @@ bool intel_encoder_hotplug(struct intel_encoder *encoder,
                      drm_get_connector_status_name(old_status),
                      drm_get_connector_status_name(connector->base.status));
 
-       return true;
+       return INTEL_HOTPLUG_CHANGED;
 }
 
 static bool intel_encoder_has_hpd_pulse(struct intel_encoder *encoder)
@@ -338,7 +341,7 @@ static void i915_digport_work_func(struct work_struct *work)
                spin_lock_irq(&dev_priv->irq_lock);
                dev_priv->hotplug.event_bits |= old_bits;
                spin_unlock_irq(&dev_priv->irq_lock);
-               schedule_work(&dev_priv->hotplug.hotplug_work);
+               queue_delayed_work(system_wq, &dev_priv->hotplug.hotplug_work, 0);
        }
 }
 
@@ -348,14 +351,16 @@ static void i915_digport_work_func(struct work_struct *work)
 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);
+               container_of(work, struct drm_i915_private,
+                            hotplug.hotplug_work.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;
+       u32 changed = 0, retry = 0;
        u32 hpd_event_bits;
+       u32 hpd_retry_bits;
 
        mutex_lock(&dev->mode_config.mutex);
        DRM_DEBUG_KMS("running encoder hotplug functions\n");
@@ -364,6 +369,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
 
        hpd_event_bits = dev_priv->hotplug.event_bits;
        dev_priv->hotplug.event_bits = 0;
+       hpd_retry_bits = dev_priv->hotplug.retry_bits;
+       dev_priv->hotplug.retry_bits = 0;
 
        /* Enable polling for connectors which had HPD IRQ storms */
        intel_hpd_irq_storm_switch_to_polling(dev_priv);
@@ -372,16 +379,29 @@ static void i915_hotplug_work_func(struct work_struct *work)
 
        drm_connector_list_iter_begin(dev, &conn_iter);
        drm_for_each_connector_iter(connector, &conn_iter) {
+               u32 hpd_bit;
+
                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)) {
+               hpd_bit = BIT(intel_encoder->hpd_pin);
+               if ((hpd_event_bits | hpd_retry_bits) & hpd_bit) {
                        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);
+                       switch (intel_encoder->hotplug(intel_encoder,
+                                                      intel_connector,
+                                                      hpd_event_bits & hpd_bit)) {
+                       case INTEL_HOTPLUG_UNCHANGED:
+                               break;
+                       case INTEL_HOTPLUG_CHANGED:
+                               changed |= hpd_bit;
+                               break;
+                       case INTEL_HOTPLUG_RETRY:
+                               retry |= hpd_bit;
+                               break;
+                       }
                }
        }
        drm_connector_list_iter_end(&conn_iter);
@@ -389,6 +409,17 @@ static void i915_hotplug_work_func(struct work_struct *work)
 
        if (changed)
                drm_kms_helper_hotplug_event(dev);
+
+       /* Remove shared HPD pins that have changed */
+       retry &= ~changed;
+       if (retry) {
+               spin_lock_irq(&dev_priv->irq_lock);
+               dev_priv->hotplug.retry_bits |= retry;
+               spin_unlock_irq(&dev_priv->irq_lock);
+
+               mod_delayed_work(system_wq, &dev_priv->hotplug.hotplug_work,
+                                msecs_to_jiffies(HPD_RETRY_DELAY));
+       }
 }
 
 
@@ -515,7 +546,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
        if (queue_dig)
                queue_work(dev_priv->hotplug.dp_wq, &dev_priv->hotplug.dig_port_work);
        if (queue_hp)
-               schedule_work(&dev_priv->hotplug.hotplug_work);
+               queue_delayed_work(system_wq, &dev_priv->hotplug.hotplug_work, 0);
 }
 
 /**
@@ -635,7 +666,8 @@ void intel_hpd_poll_init(struct drm_i915_private *dev_priv)
 
 void intel_hpd_init_work(struct drm_i915_private *dev_priv)
 {
-       INIT_WORK(&dev_priv->hotplug.hotplug_work, i915_hotplug_work_func);
+       INIT_DELAYED_WORK(&dev_priv->hotplug.hotplug_work,
+                         i915_hotplug_work_func);
        INIT_WORK(&dev_priv->hotplug.dig_port_work, i915_digport_work_func);
        INIT_WORK(&dev_priv->hotplug.poll_init_work, i915_hpd_poll_init_work);
        INIT_DELAYED_WORK(&dev_priv->hotplug.reenable_work,
@@ -649,11 +681,12 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
        dev_priv->hotplug.long_port_mask = 0;
        dev_priv->hotplug.short_port_mask = 0;
        dev_priv->hotplug.event_bits = 0;
+       dev_priv->hotplug.retry_bits = 0;
 
        spin_unlock_irq(&dev_priv->irq_lock);
 
        cancel_work_sync(&dev_priv->hotplug.dig_port_work);
-       cancel_work_sync(&dev_priv->hotplug.hotplug_work);
+       cancel_delayed_work_sync(&dev_priv->hotplug.hotplug_work);
        cancel_work_sync(&dev_priv->hotplug.poll_init_work);
        cancel_delayed_work_sync(&dev_priv->hotplug.reenable_work);
 }

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 5805ec1aba122495736167c0f66ee86cd5da249d..f814f5c6bd238b5f96357eba2e6b837b8ab0fdc8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1722,12 +1722,14 @@ static void intel_sdvo_enable_hotplug(struct intel_encoder *encoder)
                             &intel_sdvo->hotplug_active, 2);
 }
 
-static bool intel_sdvo_hotplug(struct intel_encoder *encoder,
-                              struct intel_connector *connector)
+static enum intel_hotplug_state
+intel_sdvo_hotplug(struct intel_encoder *encoder,
+                  struct intel_connector *connector,
+                  bool irq_received)
 {
        intel_sdvo_enable_hotplug(encoder);
 
-       return intel_encoder_hotplug(encoder, connector);
+       return intel_encoder_hotplug(encoder, connector, irq_received);
 }
 
 static bool