* [PATCH v3 1/2] drm/i915: Add support for retrying hotplug
@ 2019-06-28 21:39 José Roberto de Souza
2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: José Roberto de Souza @ 2019-06-28 21:39 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
From: Imre Deak <imre.deak@intel.com>
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
Cc: Ville Syrjälä <ville.syrjala@linux.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>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 12 ++--
drivers/gpu/drm/i915/display/intel_dp.c | 12 ++--
drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +++++++++++++++-----
drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 8 ++-
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 3 +-
drivers/gpu/drm/i915/intel_drv.h | 11 +++-
8 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 7925a176f900..53009984e046 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4081,14 +4081,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);
@@ -4110,7 +4112,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/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 4336df46fe78..95d0da9d1bac 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4878,14 +4878,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);
@@ -4904,7 +4906,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/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index ea3de4acc850..3662966d366e 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/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
@@ -266,8 +267,10 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
}
-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;
@@ -279,7 +282,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_NOCHANGE;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",
connector->base.base.id,
@@ -287,7 +290,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)
@@ -339,7 +342,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);
+ schedule_delayed_work(&dev_priv->hotplug.hotplug_work, 0);
}
}
@@ -349,14 +352,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");
@@ -365,6 +370,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);
@@ -373,16 +380,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_NOCHANGE:
+ break;
+ case INTEL_HOTPLUG_CHANGED:
+ changed |= hpd_bit;
+ break;
+ case INTEL_HOTPLUG_RETRY:
+ retry |= hpd_bit;
+ break;
+ }
}
}
drm_connector_list_iter_end(&conn_iter);
@@ -390,6 +410,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));
+ }
}
@@ -516,7 +547,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);
+ schedule_delayed_work(&dev_priv->hotplug.hotplug_work, 0);
}
/**
@@ -636,7 +667,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,
@@ -650,11 +682,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/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
index 805f897dbb7a..b0cd447b7fbc 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.h
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
@@ -15,8 +15,9 @@ struct intel_connector;
struct intel_encoder;
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);
void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
u32 pin_mask, u32 long_mask);
void intel_hpd_init(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index ceda03e5a3d4..2855f14f5746 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -1893,12 +1893,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
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index eeecdad0e3ca..836709ee9ff7 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4083,7 +4083,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 7e981b03face..d240997912d0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -163,7 +163,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;
@@ -175,6 +175,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_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1d58f7ec5d84..0088eb2f510e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -101,14 +101,21 @@ struct intel_fbdev {
struct mutex hpd_lock;
};
+enum intel_hotplug_state {
+ INTEL_HOTPLUG_NOCHANGE,
+ 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 *);
--
2.22.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-06-28 21:39 [PATCH v3 1/2] drm/i915: Add support for retrying hotplug José Roberto de Souza @ 2019-06-28 21:39 ` José Roberto de Souza 2019-07-02 19:54 ` Souza, Jose 2019-07-10 14:12 ` Imre Deak 2019-06-28 23:34 ` ✓ Fi.CI.BAT: success for series starting with [v3,1/2] drm/i915: Add support for retrying hotplug Patchwork ` (2 subsequent siblings) 3 siblings, 2 replies; 12+ messages in thread From: José Roberto de Souza @ 2019-06-28 21:39 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula 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) Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 21 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ drivers/gpu/drm/i915/display/intel_hdmi.c | 28 ++++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 53009984e046..d7df1940b826 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4086,6 +4086,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; @@ -4112,6 +4113,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_NOCHANGE && 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 95d0da9d1bac..8eb479daa8a8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4906,6 +4906,9 @@ intel_dp_hotplug(struct intel_encoder *encoder, drm_modeset_acquire_fini(&ctx); WARN(ret, "Acquiring modeset locks failed with %i\n", ret); + if (state == INTEL_HOTPLUG_NOCHANGE && 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 0ebec69bbbfc..5ed91caf3b4d 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -3143,6 +3143,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_NOCHANGE && 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) { @@ -3166,7 +3192,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; -- 2.22.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza @ 2019-07-02 19:54 ` Souza, Jose 2019-07-02 20:29 ` Timo Aaltonen 2019-07-10 14:12 ` Imre Deak 1 sibling, 1 reply; 12+ messages in thread From: Souza, Jose @ 2019-07-02 19:54 UTC (permalink / raw) To: intel-gfx; +Cc: Nikula, Jani Here a dmesg output of this patch working in a unpowered type-c dongle: https://gist.github.com/zehortigoza/93c54b03fb65237cc1a2e193acef61a8 With the latest type-c patches from Imre it is becoming really hard to reproduce this but is still possible, also looks like due some internal error on the dongle it being re-discovered by USB sub-system. I added this to the patches bellow have more log information: https://gist.github.com/zehortigoza/baecabeb7097b9322723b6caf5a9ced5 Let me know if you think this or something similar should be squashed to this patch, I think it is not necessary. On Fri, 2019-06-28 at 14:39 -0700, José Roberto de Souza wrote: > 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) > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 21 +++++++++++++++++ > drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ > drivers/gpu/drm/i915/display/intel_hdmi.c | 28 > ++++++++++++++++++++++- > 3 files changed, 51 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 53009984e046..d7df1940b826 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4086,6 +4086,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; > @@ -4112,6 +4113,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_NOCHANGE && 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 95d0da9d1bac..8eb479daa8a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4906,6 +4906,9 @@ intel_dp_hotplug(struct intel_encoder *encoder, > drm_modeset_acquire_fini(&ctx); > WARN(ret, "Acquiring modeset locks failed with %i\n", ret); > > + if (state == INTEL_HOTPLUG_NOCHANGE && 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 0ebec69bbbfc..5ed91caf3b4d 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -3143,6 +3143,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_NOCHANGE && 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) > { > @@ -3166,7 +3192,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; _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-07-02 19:54 ` Souza, Jose @ 2019-07-02 20:29 ` Timo Aaltonen 2019-07-02 20:41 ` Souza, Jose 0 siblings, 1 reply; 12+ messages in thread From: Timo Aaltonen @ 2019-07-02 20:29 UTC (permalink / raw) To: Souza, Jose, intel-gfx; +Cc: Nikula, Jani On 2.7.2019 22.54, Souza, Jose wrote: > Here a dmesg output of this patch working in a unpowered type-c dongle: > https://gist.github.com/zehortigoza/93c54b03fb65237cc1a2e193acef61a8 > > With the latest type-c patches from Imre it is becoming really hard to > reproduce this but is still possible, also looks like due some internal > error on the dongle it being re-discovered by USB sub-system. > > I added this to the patches bellow have more log information: > https://gist.github.com/zehortigoza/baecabeb7097b9322723b6caf5a9ced5 > Let me know if you think this or something similar should be squashed > to this patch, I think it is not necessary. FWIW, we've tested these on a WHL which is suffering from HDMI unplug still showing the display connected, and it's working fine now. -- t _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-07-02 20:29 ` Timo Aaltonen @ 2019-07-02 20:41 ` Souza, Jose 2019-07-09 9:26 ` Timo Aaltonen 0 siblings, 1 reply; 12+ messages in thread From: Souza, Jose @ 2019-07-02 20:41 UTC (permalink / raw) To: tjaalton, intel-gfx; +Cc: Nikula, Jani On Tue, 2019-07-02 at 23:29 +0300, Timo Aaltonen wrote: > On 2.7.2019 22.54, Souza, Jose wrote: > > Here a dmesg output of this patch working in a unpowered type-c > > dongle: > > https://gist.github.com/zehortigoza/93c54b03fb65237cc1a2e193acef61a8 > > > > With the latest type-c patches from Imre it is becoming really hard > > to > > reproduce this but is still possible, also looks like due some > > internal > > error on the dongle it being re-discovered by USB sub-system. > > > > I added this to the patches bellow have more log information: > > https://gist.github.com/zehortigoza/baecabeb7097b9322723b6caf5a9ced5 > > Let me know if you think this or something similar should be > > squashed > > to this patch, I think it is not necessary. > > FWIW, we've tested these on a WHL which is suffering from HDMI unplug > still showing the display connected, and it's working fine now. > > Thanks, I will add your: Tested-by: Timo Aaltonen <tjaalton@ubuntu.com> _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-07-02 20:41 ` Souza, Jose @ 2019-07-09 9:26 ` Timo Aaltonen 2019-07-09 17:40 ` Souza, Jose 0 siblings, 1 reply; 12+ messages in thread From: Timo Aaltonen @ 2019-07-09 9:26 UTC (permalink / raw) To: Souza, Jose, intel-gfx; +Cc: Nikula, Jani On 2.7.2019 23.41, Souza, Jose wrote: > On Tue, 2019-07-02 at 23:29 +0300, Timo Aaltonen wrote: >> On 2.7.2019 22.54, Souza, Jose wrote: >>> Here a dmesg output of this patch working in a unpowered type-c >>> dongle: >>> https://gist.github.com/zehortigoza/93c54b03fb65237cc1a2e193acef61a8 >>> >>> With the latest type-c patches from Imre it is becoming really hard >>> to >>> reproduce this but is still possible, also looks like due some >>> internal >>> error on the dongle it being re-discovered by USB sub-system. >>> >>> I added this to the patches bellow have more log information: >>> https://gist.github.com/zehortigoza/baecabeb7097b9322723b6caf5a9ced5 >>> Let me know if you think this or something similar should be >>> squashed >>> to this patch, I think it is not necessary. >> >> FWIW, we've tested these on a WHL which is suffering from HDMI unplug >> still showing the display connected, and it's working fine now. >> >> > > Thanks, I will add your: > > Tested-by: Timo Aaltonen <tjaalton@ubuntu.com> That's fine. When can we expect these to land on dinq? -- t _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-07-09 9:26 ` Timo Aaltonen @ 2019-07-09 17:40 ` Souza, Jose 0 siblings, 0 replies; 12+ messages in thread From: Souza, Jose @ 2019-07-09 17:40 UTC (permalink / raw) To: tjaalton, intel-gfx; +Cc: Nikula, Jani On Tue, 2019-07-09 at 12:26 +0300, Timo Aaltonen wrote: > On 2.7.2019 23.41, Souza, Jose wrote: > > On Tue, 2019-07-02 at 23:29 +0300, Timo Aaltonen wrote: > > > On 2.7.2019 22.54, Souza, Jose wrote: > > > > Here a dmesg output of this patch working in a unpowered type-c > > > > dongle: > > > > https://gist.github.com/zehortigoza/93c54b03fb65237cc1a2e193acef61a8 > > > > > > > > With the latest type-c patches from Imre it is becoming really > > > > hard > > > > to > > > > reproduce this but is still possible, also looks like due some > > > > internal > > > > error on the dongle it being re-discovered by USB sub-system. > > > > > > > > I added this to the patches bellow have more log information: > > > > https://gist.github.com/zehortigoza/baecabeb7097b9322723b6caf5a9ced5 > > > > Let me know if you think this or something similar should be > > > > squashed > > > > to this patch, I think it is not necessary. > > > > > > FWIW, we've tested these on a WHL which is suffering from HDMI > > > unplug > > > still showing the display connected, and it's working fine now. > > > > > > > > > > Thanks, I will add your: > > > > Tested-by: Timo Aaltonen <tjaalton@ubuntu.com> > > That's fine. When can we expect these to land on dinq? > > > As soon as someone reviews it. Imre can you review the the second patch? I will find someone to review the first one. _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/2] drm/i915: Enable hotplug retry 2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza 2019-07-02 19:54 ` Souza, Jose @ 2019-07-10 14:12 ` Imre Deak 1 sibling, 0 replies; 12+ messages in thread From: Imre Deak @ 2019-07-10 14:12 UTC (permalink / raw) To: José Roberto de Souza; +Cc: Jani Nikula, intel-gfx On Fri, Jun 28, 2019 at 02:39:21PM -0700, José Roberto de Souza wrote: > 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) > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 21 +++++++++++++++++ > drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ > drivers/gpu/drm/i915/display/intel_hdmi.c | 28 ++++++++++++++++++++++- > 3 files changed, 51 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 53009984e046..d7df1940b826 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4086,6 +4086,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; > @@ -4112,6 +4113,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_NOCHANGE && 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 95d0da9d1bac..8eb479daa8a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4906,6 +4906,9 @@ intel_dp_hotplug(struct intel_encoder *encoder, > drm_modeset_acquire_fini(&ctx); > WARN(ret, "Acquiring modeset locks failed with %i\n", ret); Nit: could add a short comment, that a long HPD interrupt that doesn't result in a connector state change could be just a transient state, so we retry the detection. > + if (state == INTEL_HOTPLUG_NOCHANGE && 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 0ebec69bbbfc..5ed91caf3b4d 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -3143,6 +3143,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. > + */ This is the same description of the issue that DDI encoders have, so could be just replaced with a reference to the intel_ddi_hotplug() func. Looks ok: Reviewed-by: Imre Deak <imre.deak@intel.com> > + if (state == INTEL_HOTPLUG_NOCHANGE && 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) > { > @@ -3166,7 +3192,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; > -- > 2.22.0 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [v3,1/2] drm/i915: Add support for retrying hotplug 2019-06-28 21:39 [PATCH v3 1/2] drm/i915: Add support for retrying hotplug José Roberto de Souza 2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza @ 2019-06-28 23:34 ` Patchwork 2019-06-29 12:20 ` ✓ Fi.CI.IGT: " Patchwork 2019-07-10 11:20 ` [PATCH v3 1/2] " Rodrigo Vivi 3 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2019-06-28 23:34 UTC (permalink / raw) To: José Roberto de Souza; +Cc: intel-gfx == Series Details == Series: series starting with [v3,1/2] drm/i915: Add support for retrying hotplug URL : https://patchwork.freedesktop.org/series/62965/ State : success == Summary == CI Bug Log - changes from CI_DRM_6384 -> Patchwork_13471 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/ Known issues ------------ Here are the changes found in Patchwork_13471 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_basic@create-fd-close: - fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/fi-icl-u3/igt@gem_basic@create-fd-close.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/fi-icl-u3/igt@gem_basic@create-fd-close.html * igt@gem_ctx_create@basic-files: - fi-icl-u3: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713] / [fdo#109100]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/fi-icl-u3/igt@gem_ctx_create@basic-files.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/fi-icl-u3/igt@gem_ctx_create@basic-files.html * igt@i915_pm_rpm@basic-pci-d3-state: - fi-kbl-r: [PASS][5] -> [DMESG-WARN][6] ([fdo#111012]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/fi-kbl-r/igt@i915_pm_rpm@basic-pci-d3-state.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/fi-kbl-r/igt@i915_pm_rpm@basic-pci-d3-state.html * igt@i915_selftest@live_blt: - fi-skl-iommu: [PASS][7] -> [INCOMPLETE][8] ([fdo#108602]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/fi-skl-iommu/igt@i915_selftest@live_blt.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/fi-skl-iommu/igt@i915_selftest@live_blt.html #### Possible fixes #### * igt@kms_frontbuffer_tracking@basic: - fi-icl-dsi: [DMESG-WARN][9] ([fdo#106107]) -> [PASS][10] [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602 [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100 [fdo#111012]: https://bugs.freedesktop.org/show_bug.cgi?id=111012 Participating hosts (52 -> 43) ------------------------------ Additional (1): fi-hsw-4770r Missing (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-gdg-551 fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_6384 -> Patchwork_13471 CI_DRM_6384: 69d66a9ddf47e9d5c250e7011a3b97ad0608512d @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5075: 03779dd3de8a57544f124d9952a6d2b3e34e34ca @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13471: 19453312d8cf7e750eb763735e0715ad9f145c6b @ git://anongit.freedesktop.org/gfx-ci/linux == Kernel 32bit build == Warning: Kernel 32bit buildtest failed: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/build_32bit.log CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h Kernel: arch/x86/boot/bzImage is ready (#1) Building modules, stage 2. MODPOST 112 modules ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1 Makefile:1287: recipe for target 'modules' failed make: *** [modules] Error 2 == Linux commits == 19453312d8cf drm/i915: Enable hotplug retry 6668a33333af drm/i915: Add support for retrying hotplug == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [v3,1/2] drm/i915: Add support for retrying hotplug 2019-06-28 21:39 [PATCH v3 1/2] drm/i915: Add support for retrying hotplug José Roberto de Souza 2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza 2019-06-28 23:34 ` ✓ Fi.CI.BAT: success for series starting with [v3,1/2] drm/i915: Add support for retrying hotplug Patchwork @ 2019-06-29 12:20 ` Patchwork 2019-07-10 11:20 ` [PATCH v3 1/2] " Rodrigo Vivi 3 siblings, 0 replies; 12+ messages in thread From: Patchwork @ 2019-06-29 12:20 UTC (permalink / raw) To: Souza, Jose; +Cc: intel-gfx == Series Details == Series: series starting with [v3,1/2] drm/i915: Add support for retrying hotplug URL : https://patchwork.freedesktop.org/series/62965/ State : success == Summary == CI Bug Log - changes from CI_DRM_6384_full -> Patchwork_13471_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_13471_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@i915_selftest@mock_requests: - shard-skl: [PASS][1] -> [INCOMPLETE][2] ([fdo#110550]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl3/igt@i915_selftest@mock_requests.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl1/igt@i915_selftest@mock_requests.html * igt@kms_color@pipe-b-ctm-negative: - shard-skl: [PASS][3] -> [FAIL][4] ([fdo#107361]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl5/igt@kms_color@pipe-b-ctm-negative.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl3/igt@kms_color@pipe-b-ctm-negative.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic: - shard-skl: [PASS][5] -> [FAIL][6] ([fdo#102670]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html * igt@kms_flip@2x-blocking-absolute-wf_vblank: - shard-hsw: [PASS][7] -> [SKIP][8] ([fdo#109271]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-hsw2/igt@kms_flip@2x-blocking-absolute-wf_vblank.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-hsw1/igt@kms_flip@2x-blocking-absolute-wf_vblank.html * igt@kms_flip@flip-vs-suspend-interruptible: - shard-iclb: [PASS][9] -> [INCOMPLETE][10] ([fdo#107713] / [fdo#109507]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb6/igt@kms_flip@flip-vs-suspend-interruptible.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb3/igt@kms_flip@flip-vs-suspend-interruptible.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render: - shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167]) +5 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566]) +5 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-apl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-apl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: - shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145]) +1 similar issue [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [PASS][17] -> [FAIL][18] ([fdo#108145] / [fdo#110403]) +1 similar issue [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_psr@psr2_cursor_render: - shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb2/igt@kms_psr@psr2_cursor_render.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb5/igt@kms_psr@psr2_cursor_render.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([fdo#108566]) +2 similar issues [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-kbl1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html * igt@kms_vblank@pipe-c-ts-continuation-suspend: - shard-iclb: [PASS][23] -> [INCOMPLETE][24] ([fdo#107713]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb4/igt@kms_vblank@pipe-c-ts-continuation-suspend.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb3/igt@kms_vblank@pipe-c-ts-continuation-suspend.html * igt@perf@blocking: - shard-skl: [PASS][25] -> [FAIL][26] ([fdo#110728]) +1 similar issue [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl5/igt@perf@blocking.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl4/igt@perf@blocking.html #### Possible fixes #### * igt@gem_ctx_isolation@bcs0-s3: - shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +3 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-apl1/igt@gem_ctx_isolation@bcs0-s3.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-apl5/igt@gem_ctx_isolation@bcs0-s3.html - shard-kbl: [DMESG-WARN][29] ([fdo#108566]) -> [PASS][30] +2 similar issues [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-kbl6/igt@gem_ctx_isolation@bcs0-s3.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-kbl7/igt@gem_ctx_isolation@bcs0-s3.html * igt@gem_eio@reset-stress: - shard-skl: [FAIL][31] ([fdo#109661]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl7/igt@gem_eio@reset-stress.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl10/igt@gem_eio@reset-stress.html * igt@i915_pm_backlight@fade_with_suspend: - shard-skl: [INCOMPLETE][33] ([fdo#104108]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl3/igt@i915_pm_backlight@fade_with_suspend.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl9/igt@i915_pm_backlight@fade_with_suspend.html * igt@i915_pm_rpm@debugfs-forcewake-user: - shard-iclb: [INCOMPLETE][35] ([fdo#107713] / [fdo#108840]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb2/igt@i915_pm_rpm@debugfs-forcewake-user.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb2/igt@i915_pm_rpm@debugfs-forcewake-user.html * igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw: - shard-iclb: [FAIL][37] ([fdo#103167]) -> [PASS][38] +1 similar issue [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render: - shard-hsw: [SKIP][39] ([fdo#109271]) -> [PASS][40] +24 similar issues [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-kbl: [INCOMPLETE][41] ([fdo#103665]) -> [PASS][42] [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-kbl3/igt@kms_frontbuffer_tracking@fbc-suspend.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: - shard-skl: [FAIL][43] ([fdo#108145]) -> [PASS][44] [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html * igt@kms_plane_lowres@pipe-a-tiling-y: - shard-iclb: [FAIL][45] ([fdo#103166]) -> [PASS][46] [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-y.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-y.html * igt@kms_sequence@get-busy: - shard-iclb: [INCOMPLETE][47] ([fdo#107713]) -> [PASS][48] [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb7/igt@kms_sequence@get-busy.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb7/igt@kms_sequence@get-busy.html * igt@kms_setmode@basic: - shard-apl: [FAIL][49] ([fdo#99912]) -> [PASS][50] [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-apl2/igt@kms_setmode@basic.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-apl5/igt@kms_setmode@basic.html - shard-kbl: [FAIL][51] ([fdo#99912]) -> [PASS][52] [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-kbl7/igt@kms_setmode@basic.html [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-kbl6/igt@kms_setmode@basic.html * igt@kms_sysfs_edid_timing: - shard-hsw: [FAIL][53] ([fdo#100047]) -> [PASS][54] [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-hsw1/igt@kms_sysfs_edid_timing.html [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-hsw5/igt@kms_sysfs_edid_timing.html * igt@perf_pmu@rc6: - shard-kbl: [SKIP][55] ([fdo#109271]) -> [PASS][56] +1 similar issue [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-kbl7/igt@perf_pmu@rc6.html [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-kbl1/igt@perf_pmu@rc6.html #### Warnings #### * igt@kms_dp_dsc@basic-dsc-enable-edp: - shard-iclb: [SKIP][57] ([fdo#109349]) -> [DMESG-WARN][58] ([fdo#107724]) [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6384/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047 [fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670 [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665 [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108 [fdo#107361]: https://bugs.freedesktop.org/show_bug.cgi?id=107361 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507 [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661 [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 [fdo#110550]: https://bugs.freedesktop.org/show_bug.cgi?id=110550 [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 Participating hosts (10 -> 10) ------------------------------ No changes in participating hosts Build changes ------------- * Linux: CI_DRM_6384 -> Patchwork_13471 CI_DRM_6384: 69d66a9ddf47e9d5c250e7011a3b97ad0608512d @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5075: 03779dd3de8a57544f124d9952a6d2b3e34e34ca @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13471: 19453312d8cf7e750eb763735e0715ad9f145c6b @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13471/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/2] drm/i915: Add support for retrying hotplug 2019-06-28 21:39 [PATCH v3 1/2] drm/i915: Add support for retrying hotplug José Roberto de Souza ` (2 preceding siblings ...) 2019-06-29 12:20 ` ✓ Fi.CI.IGT: " Patchwork @ 2019-07-10 11:20 ` Rodrigo Vivi 2019-07-10 22:17 ` Souza, Jose 3 siblings, 1 reply; 12+ messages in thread From: Rodrigo Vivi @ 2019-07-10 11:20 UTC (permalink / raw) To: José Roberto de Souza; +Cc: Jani Nikula, intel-gfx On Fri, Jun 28, 2019 at 02:39:20PM -0700, José Roberto de Souza wrote: > From: Imre Deak <imre.deak@intel.com> > > 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 > > Cc: Ville Syrjälä <ville.syrjala@linux.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> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 12 ++-- > drivers/gpu/drm/i915/display/intel_dp.c | 12 ++-- > drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +++++++++++++++----- > drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- > drivers/gpu/drm/i915/display/intel_sdvo.c | 8 ++- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 3 +- > drivers/gpu/drm/i915/intel_drv.h | 11 +++- > 8 files changed, 80 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 7925a176f900..53009984e046 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4081,14 +4081,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); > > @@ -4110,7 +4112,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/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 4336df46fe78..95d0da9d1bac 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -4878,14 +4878,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); > > @@ -4904,7 +4906,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/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c > index ea3de4acc850..3662966d366e 100644 > --- a/drivers/gpu/drm/i915/display/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/display/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 > @@ -266,8 +267,10 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work) > intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); > } > > -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; > @@ -279,7 +282,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_NOCHANGE; > > DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", > connector->base.base.id, > @@ -287,7 +290,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) > @@ -339,7 +342,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); > + schedule_delayed_work(&dev_priv->hotplug.hotplug_work, 0); > } > } > > @@ -349,14 +352,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"); > @@ -365,6 +370,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); > @@ -373,16 +380,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_NOCHANGE: > + break; > + case INTEL_HOTPLUG_CHANGED: > + changed |= hpd_bit; > + break; > + case INTEL_HOTPLUG_RETRY: > + retry |= hpd_bit; > + break; > + } > } > } > drm_connector_list_iter_end(&conn_iter); > @@ -390,6 +410,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)); > + } > } > > > @@ -516,7 +547,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); > + schedule_delayed_work(&dev_priv->hotplug.hotplug_work, 0); > } > > /** > @@ -636,7 +667,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, > @@ -650,11 +682,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/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h > index 805f897dbb7a..b0cd447b7fbc 100644 > --- a/drivers/gpu/drm/i915/display/intel_hotplug.h > +++ b/drivers/gpu/drm/i915/display/intel_hotplug.h > @@ -15,8 +15,9 @@ struct intel_connector; > struct intel_encoder; > > 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); > void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, > u32 pin_mask, u32 long_mask); > void intel_hpd_init(struct drm_i915_private *dev_priv); > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c > index ceda03e5a3d4..2855f14f5746 100644 > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > @@ -1893,12 +1893,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 > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index eeecdad0e3ca..836709ee9ff7 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -4083,7 +4083,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 7e981b03face..d240997912d0 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -163,7 +163,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; > @@ -175,6 +175,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_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 1d58f7ec5d84..0088eb2f510e 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -101,14 +101,21 @@ struct intel_fbdev { > struct mutex hpd_lock; > }; > > +enum intel_hotplug_state { > + INTEL_HOTPLUG_NOCHANGE, > + INTEL_HOTPLUG_CHANGED, my only bikeshed would be to keep this symmetric... no-change change or preferably unchanged changed. But everything seems right so let's move Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > + 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 *); > -- > 2.22.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/2] drm/i915: Add support for retrying hotplug 2019-07-10 11:20 ` [PATCH v3 1/2] " Rodrigo Vivi @ 2019-07-10 22:17 ` Souza, Jose 0 siblings, 0 replies; 12+ messages in thread From: Souza, Jose @ 2019-07-10 22:17 UTC (permalink / raw) To: Vivi, Rodrigo; +Cc: Nikula, Jani, intel-gfx On Wed, 2019-07-10 at 04:20 -0700, Rodrigo Vivi wrote: > On Fri, Jun 28, 2019 at 02:39:20PM -0700, José Roberto de Souza > wrote: > > From: Imre Deak <imre.deak@intel.com> > > > > 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 > > > > Cc: Ville Syrjälä <ville.syrjala@linux.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> > > --- > > drivers/gpu/drm/i915/display/intel_ddi.c | 12 ++-- > > drivers/gpu/drm/i915/display/intel_dp.c | 12 ++-- > > drivers/gpu/drm/i915/display/intel_hotplug.c | 59 +++++++++++++++- > > ---- > > drivers/gpu/drm/i915/display/intel_hotplug.h | 5 +- > > drivers/gpu/drm/i915/display/intel_sdvo.c | 8 ++- > > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > > drivers/gpu/drm/i915/i915_drv.h | 3 +- > > drivers/gpu/drm/i915/intel_drv.h | 11 +++- > > 8 files changed, 80 insertions(+), 32 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index 7925a176f900..53009984e046 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -4081,14 +4081,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); > > > > @@ -4110,7 +4112,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/display/intel_dp.c > > b/drivers/gpu/drm/i915/display/intel_dp.c > > index 4336df46fe78..95d0da9d1bac 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -4878,14 +4878,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); > > > > @@ -4904,7 +4906,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/display/intel_hotplug.c > > b/drivers/gpu/drm/i915/display/intel_hotplug.c > > index ea3de4acc850..3662966d366e 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hotplug.c > > +++ b/drivers/gpu/drm/i915/display/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 > > @@ -266,8 +267,10 @@ static void > > intel_hpd_irq_storm_reenable_work(struct work_struct *work) > > intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); > > } > > > > -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; > > @@ -279,7 +282,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_NOCHANGE; > > > > DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to > > %s\n", > > connector->base.base.id, > > @@ -287,7 +290,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) > > @@ -339,7 +342,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); > > + schedule_delayed_work(&dev_priv->hotplug.hotplug_work, > > 0); > > } > > } > > > > @@ -349,14 +352,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"); > > @@ -365,6 +370,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); > > @@ -373,16 +380,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_connect > > or); > > + switch (intel_encoder->hotplug(intel_encoder, > > + intel_connector, > > + hpd_event_bits & > > hpd_bit)) { > > + case INTEL_HOTPLUG_NOCHANGE: > > + break; > > + case INTEL_HOTPLUG_CHANGED: > > + changed |= hpd_bit; > > + break; > > + case INTEL_HOTPLUG_RETRY: > > + retry |= hpd_bit; > > + break; > > + } > > } > > } > > drm_connector_list_iter_end(&conn_iter); > > @@ -390,6 +410,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)); > > + } > > } > > > > > > @@ -516,7 +547,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); > > + schedule_delayed_work(&dev_priv->hotplug.hotplug_work, > > 0); > > } > > > > /** > > @@ -636,7 +667,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, > > @@ -650,11 +682,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/display/intel_hotplug.h > > b/drivers/gpu/drm/i915/display/intel_hotplug.h > > index 805f897dbb7a..b0cd447b7fbc 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hotplug.h > > +++ b/drivers/gpu/drm/i915/display/intel_hotplug.h > > @@ -15,8 +15,9 @@ struct intel_connector; > > struct intel_encoder; > > > > 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); > > void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, > > u32 pin_mask, u32 long_mask); > > void intel_hpd_init(struct drm_i915_private *dev_priv); > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c > > b/drivers/gpu/drm/i915/display/intel_sdvo.c > > index ceda03e5a3d4..2855f14f5746 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > > @@ -1893,12 +1893,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 > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c > > b/drivers/gpu/drm/i915/i915_debugfs.c > > index eeecdad0e3ca..836709ee9ff7 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -4083,7 +4083,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 7e981b03face..d240997912d0 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -163,7 +163,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; > > @@ -175,6 +175,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_drv.h > > b/drivers/gpu/drm/i915/intel_drv.h > > index 1d58f7ec5d84..0088eb2f510e 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -101,14 +101,21 @@ struct intel_fbdev { > > struct mutex hpd_lock; > > }; > > > > +enum intel_hotplug_state { > > + INTEL_HOTPLUG_NOCHANGE, > > + INTEL_HOTPLUG_CHANGED, > > my only bikeshed would be to keep this symmetric... > no-change change or preferably unchanged changed. > > But everything seems right so let's move Just sent a new version replacing nochange to unchanged and added your r-v-b. Thanks > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > + 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 *); > > -- > > 2.22.0 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-07-10 22:17 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-06-28 21:39 [PATCH v3 1/2] drm/i915: Add support for retrying hotplug José Roberto de Souza 2019-06-28 21:39 ` [PATCH v3 2/2] drm/i915: Enable hotplug retry José Roberto de Souza 2019-07-02 19:54 ` Souza, Jose 2019-07-02 20:29 ` Timo Aaltonen 2019-07-02 20:41 ` Souza, Jose 2019-07-09 9:26 ` Timo Aaltonen 2019-07-09 17:40 ` Souza, Jose 2019-07-10 14:12 ` Imre Deak 2019-06-28 23:34 ` ✓ Fi.CI.BAT: success for series starting with [v3,1/2] drm/i915: Add support for retrying hotplug Patchwork 2019-06-29 12:20 ` ✓ Fi.CI.IGT: " Patchwork 2019-07-10 11:20 ` [PATCH v3 1/2] " Rodrigo Vivi 2019-07-10 22:17 ` Souza, Jose
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.