Skip to contentSkip to conversation

drm: i915: Don't try detecting sinks on ports already in use

PATCH RESEND In review Gabriel Krisman Bertazi 5 participants 7 messages May 4, 2017 – Jun 19, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 drm: i915: Don't try detecting sinks on ports already in use

On systems where more than one connector is attached to the same port, the HPD pin is also shared, and attaching one connector will trigger a hotplug on every other connector on that port. But, according to the documentation, connectors sharing the port cannot be enabled simultaneously, such that we can abort the detection process early if another connector was detected succesfully.

This has the good side effect of preventing DP timeouts whenever something else is connected to the shared port, like below:

[drm:intel_dp_aux_ch [i915]] dp_aux_ch timeout status 0x7143003f [drm:drm_dp_dpcd_access] Too many retries, giving up. First error: -110

Since this reduces the overhead of the i915_hotplug_work_func, it may address the following vblank misses detected by the CI:

https://bugs.freedesktop.org/show_bug.cgi?id=100215
https://bugs.freedesktop.org/show_bug.cgi?id=100558

---
 drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_dp.c      |  3 +++
 drivers/gpu/drm/i915/intel_drv.h     |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c    |  3 +++
 4 files changed, 33 insertions(+)
drivers/gpu/drm/i915/intel_display.c +26 -0
index 85b9e2f521a0..618b5138c0c7 100644
@@ -11270,6 +11270,32 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	return true;
 }
 
+bool intel_shared_digital_port_in_use(struct drm_connector *conn)
+{
+	struct drm_connector *peer;
+	struct drm_connector_list_iter iter;
+	struct intel_encoder *enc = to_intel_connector(conn)->encoder;
+	int ret = false;
+
+	drm_connector_list_iter_begin(conn->dev, &iter);
+	drm_for_each_connector_iter(peer, &iter) {
+		struct intel_encoder *peer_enc;
+
+		if (peer == conn ||
+		    peer->status != connector_status_connected)
+			continue;
+
+		peer_enc = to_intel_connector(peer)->encoder;
+		if (peer_enc->port == enc->port) {
+			ret = true;
+			break;
+		}
+	}
+	drm_connector_list_iter_end(&iter);
+
+	return ret;
+}
+
 static void
 clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
 {
drivers/gpu/drm/i915/intel_dp.c +3 -0
index 08834f74d396..0823c588575f 100644
@@ -4628,6 +4628,9 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
 
 	WARN_ON(!drm_modeset_is_locked(&connector->dev->mode_config.connection_mutex));
 
+	if (intel_shared_digital_port_in_use(connector))
+		return connector_status_disconnected;
+
 	intel_display_power_get(to_i915(dev), intel_dp->aux_power_domain);
 
 	/* Can't disconnect eDP, but you can close the lid... */
drivers/gpu/drm/i915/intel_drv.h +1 -0
index 54f3ff840812..fd5f2517bede 100644
@@ -1411,6 +1411,7 @@ int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,
 		     const struct dpll *dpll);
 void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe);
 int lpt_get_iclkip(struct drm_i915_private *dev_priv);
+bool intel_shared_digital_port_in_use(struct drm_connector *conn);
 
 /* modesetting asserts */
 void assert_panel_unlocked(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
index 52f0b2d5fad2..9ce0b1f45cde 100644
@@ -1532,6 +1532,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
+	if (intel_shared_digital_port_in_use(connector))
+		return connector_status_disconnected;;
+
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
 	intel_hdmi_unset_edid(connector);
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm: i915: Don't try detecting sinks on ports already in use (rev2)

== Series Details ==

== Series Details ==

Series: drm: i915: Don't try detecting sinks on ports already in use (rev2)
URL : https://patchwork.freedesktop.org/series/23299/
State : success

== Summary ==

Series 23299v2 drm: i915: Don't try detecting sinks on ports already in use
https://patchwork.freedesktop.org/api/1.0/series/23299/revisions/2/mbox/

Test gem_exec_suspend:

        Subgroup basic-s4-devices:
                dmesg-warn -> PASS       (fi-kbl-7560u) fdo#100125

fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:422s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:426s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:570s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:500s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time:544s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:466s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:477s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:416s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:403s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:420s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:490s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:457s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:463s
fi-kbl-7560u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:566s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:459s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time:568s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:460s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:490s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:434s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:528s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:398s

369880c1680bf9bde467a40d2a03d3ad32341281 drm-tip: 2017y-05m-04d-15h-00m-33s UTC integration manifest 723be02 drm: i915: Don't try detecting sinks on ports already in use

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4627/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Gabriel Krisman Bertazi
Quoted 13 lines · Gabriel Krisman Bertazi

On systems where more than one connector is attached to the same port, the HPD pin is also shared, and attaching one connector will trigger a hotplug on every other connector on that port. But, according to the documentation, connectors sharing the port cannot be enabled simultaneously, such that we can abort the detection process early if another connector was detected succesfully.

This has the good side effect of preventing DP timeouts whenever something else is connected to the shared port, like below:

[drm:intel_dp_aux_ch [i915]] dp_aux_ch timeout status 0x7143003f [drm:drm_dp_dpcd_access] Too many retries, giving up. First error: -110

Quoted 7 lines

Since this reduces the overhead of the i915_hotplug_work_func, it may address the following vblank misses detected by the CI:

https://bugs.freedesktop.org/show_bug.cgi?id=100215
https://bugs.freedesktop.org/show_bug.cgi?id=100558

The key problem here is say a race between DP unplug and HDMI plug, and users are evil enough (or common enough) for it to happen.

I thought the idea was reasonable though, and perhaps we could make more use of the knowlege of the shared ports to improve detection of common DP/HDMI DDIs (i.e. run detection once for a ddi and have it decide whether it is hdmi or dp).
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 7 lines · Chris Wilson

The key problem here is say a race between DP unplug and HDMI plug, and users are evil enough (or common enough) for it to happen.

I thought the idea was reasonable though, and perhaps we could make more use of the knowlege of the shared ports to improve detection of common DP/HDMI DDIs (i.e. run detection once for a ddi and have it decide whether it is hdmi or dp).

Hi Chris and Manasi, thanks for the feedback and sorry for the late response.

I see your point about being racy. I think this is not an issue in my system since it appears that the disconnect of the first connector triggers another scheduling of the hotplug_work, that further detects the other connector.

I'm still working on this, but can you provide more details on your suggestion about using more knowledge of the shared ports to improve the detection of DDIs? I still don't see how we could prevent this race once and for all.

In the mean time, I wrote another patch with a different way to reduce the overhead of attempting to detect connectors of shared ports already in use. My understanding is that this version is no longer racy but it doesn't catch every condition where we could avoid detection. Though, it feels like something we want to get upstream. Can you please take a look and let me know?

I think this also addresses the cloned encoders issue raised by Manasi, if I understood it correctly.

Quoted 1 line

8

Subject: [PATCH] drm: i915: Stop further detection on shared pins if a sink is
connected

HPD pins may be shared among connectors but, according to documentation, only one connector can be enebled at any given time. This avoids waisting time with attempting to detect further connectors on the same pin if the first one was already detected.

Since this reduces the overhead of the i915_hotplug_work_func, it may address the following vblank misses detected by the CI:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100215
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100558

---
 drivers/gpu/drm/i915/intel_hotplug.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_hotplug.c +8 -2
index f1200272a699..913e8523b89d 100644
@@ -319,6 +319,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
 	struct drm_connector_list_iter conn_iter;
 	bool changed = false;
 	u32 hpd_event_bits;
+	u32 enc_hpd_pin_mask;
 
 	mutex_lock(&dev->mode_config.mutex);
 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
@@ -339,13 +340,18 @@ static void i915_hotplug_work_func(struct work_struct *work)
 		if (!intel_connector->encoder)
 			continue;
 		intel_encoder = intel_connector->encoder;
-		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
+		enc_hpd_pin_mask = (1 << intel_encoder->hpd_pin);
+		if (hpd_event_bits & enc_hpd_pin_mask) {
 			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
 				      connector->name, intel_encoder->hpd_pin);
 			if (intel_encoder->hot_plug)
 				intel_encoder->hot_plug(intel_encoder);
-			if (intel_hpd_irq_event(dev, connector))
+			if (intel_hpd_irq_event(dev, connector)) {
 				changed = true;
+				if (connector->status ==
+				    connector_status_connected)
+					hpd_event_bits &= ~(enc_hpd_pin_mask);
+			}
 		}
 	}
 	drm_connector_list_iter_end(&conn_iter);
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 72 lines · Gabriel Krisman Bertazi
Quoted 7 lines · Chris Wilson

The key problem here is say a race between DP unplug and HDMI plug, and users are evil enough (or common enough) for it to happen.

I thought the idea was reasonable though, and perhaps we could make more use of the knowlege of the shared ports to improve detection of common DP/HDMI DDIs (i.e. run detection once for a ddi and have it decide whether it is hdmi or dp).

Hi Chris and Manasi, thanks for the feedback and sorry for the late response.

I see your point about being racy. I think this is not an issue in my system since it appears that the disconnect of the first connector triggers another scheduling of the hotplug_work, that further detects the other connector.

I'm still working on this, but can you provide more details on your suggestion about using more knowledge of the shared ports to improve the detection of DDIs? I still don't see how we could prevent this race once and for all.

In the mean time, I wrote another patch with a different way to reduce the overhead of attempting to detect connectors of shared ports already in use. My understanding is that this version is no longer racy but it doesn't catch every condition where we could avoid detection. Though, it feels like something we want to get upstream. Can you please take a look and let me know?

I think this also addresses the cloned encoders issue raised by Manasi, if I understood it correctly.

Quoted 1 line

8

Subject: [PATCH] drm: i915: Stop further detection on shared pins if a sink is
connected

HPD pins may be shared among connectors but, according to documentation, only one connector can be enebled at any given time. This avoids waisting time with attempting to detect further connectors on the same pin if the first one was already detected.

Since this reduces the overhead of the i915_hotplug_work_func, it may address the following vblank misses detected by the CI:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100215
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100558

---
 drivers/gpu/drm/i915/intel_hotplug.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_hotplug.c +3 -1
index f1200272a699..913e8523b89d 100644
@@ -319,6 +319,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
 	struct drm_connector_list_iter conn_iter;
 	bool changed = false;
 	u32 hpd_event_bits;
+	u32 enc_hpd_pin_mask;
 
 	mutex_lock(&dev->mode_config.mutex);
 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
@@ -339,13 +340,18 @@ static void i915_hotplug_work_func(struct work_struct *work)
 		if (!intel_connector->encoder)
 			continue;
 		intel_encoder = intel_connector->encoder;
-		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
+		enc_hpd_pin_mask = (1 << intel_encoder->hpd_pin);
+		if (hpd_event_bits & enc_hpd_pin_mask) {

drivers/gpu/drm/i915/intel_hotplug.c static void i915_hotplug_work_func(struct work_struct *work) · line 353

Quoted 10 lines
drivers/gpu/drm/i915/intel_hotplug.c +4 -1
 			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
 				      connector->name, intel_encoder->hpd_pin);
 			if (intel_encoder->hot_plug)
 				intel_encoder->hot_plug(intel_encoder);
-			if (intel_hpd_irq_event(dev, connector))
+			if (intel_hpd_irq_event(dev, connector)) {
 				changed = true;
+				if (connector->status ==
+				    connector_status_connected)
+					hpd_event_bits &= ~(enc_hpd_pin_mask);

This won't work correctly because now it will fail to update connector->status for the other connector. I admit that being fast enough to switch between DP<->HDMI directly while the HPD interrupt is enabled is perhaps a little unlikely, but it can certainly happen very easily if the interrupt has been disabled.

We alrady have other bugs in that area. Eg. if you manage to switch to a totally different display without noticing the disconnected state in between we'll skip sending the uevent. We should really be checking if the sink changed somehow (eg. EDID changed) and in that case send the uevent anyway.

I also don't think this can have anything to do with vblank tests failing, unless there's some other problem involved that somehow triggers HPDs while the test is doing its measurements.

Quoted 11 lines
drivers/gpu/drm/i915/intel_hotplug.c +1 -0
+			}
 		}
 	}
 	drm_connector_list_iter_end(&conn_iter);
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 17 lines · Ville Syrjälä
Quoted 17 lines
drivers/gpu/drm/i915/intel_hotplug.c +4 -2
 	mutex_lock(&dev->mode_config.mutex);
 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
@@ -339,13 +340,18 @@ static void i915_hotplug_work_func(struct work_struct *work)
 		if (!intel_connector->encoder)
 			continue;
 		intel_encoder = intel_connector->encoder;
-		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
+		enc_hpd_pin_mask = (1 << intel_encoder->hpd_pin);
+		if (hpd_event_bits & enc_hpd_pin_mask) {
 			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
 				      connector->name, intel_encoder->hpd_pin);
 			if (intel_encoder->hot_plug)
 				intel_encoder->hot_plug(intel_encoder);
-			if (intel_hpd_irq_event(dev, connector))
+			if (intel_hpd_irq_event(dev, connector)) {
 				changed = true;
+				if (connector->status ==
Quoted 8 lines

drivers/gpu/drm/i915/intel_hotplug.c static void i915_hotplug_work_func(struct work_struct *work) · line 353

Quoted 2 lines
drivers/gpu/drm/i915/intel_hotplug.c +2 -0
+				    connector_status_connected)
+					hpd_event_bits &= ~(enc_hpd_pin_mask);

This won't work correctly because now it will fail to update connector->status for the other connector. I admit that being fast enough to switch between DP<->HDMI directly while the HPD interrupt is enabled is perhaps a little unlikely, but it can certainly happen very easily if the interrupt has been disabled.

Hi Ville,

I see. So, still racy when dealing with multiple connectors events on the same HPD line. Nice catch. I didn't see that.

Quoted 9 lines

We alrady have other bugs in that area. Eg. if you manage to switch to a totally different display without noticing the disconnected state in between we'll skip sending the uevent. We should really be checking if the sink changed somehow (eg. EDID changed) and in that case send the uevent anyway.

I also don't think this can have anything to do with vblank tests failing, unless there's some other problem involved that somehow triggers HPDs while the test is doing its measurements.

I thought about (blindly) reducing the overhead of i915_hotplug_work_func, as mentioned by Chris in his second comment in the report for bug 100215. But I understand that the latest reproduction of 100215 triggered a lot of timeouts directly from userspace, and I didn't find any HPD occurrences there.

Anyway, correct me if I'm wrong, but I still understand that the amount of time the DP detection takes is a little too much, and the fact that it triggers whenever we connect anything to a shared port is very odd behavior. There are a few bugs reported where the DP detection timeouts was pointed as the probable root cause.

I came up with two patches to workaround the issue but they both had issues of their own. I understand the first version I submitted is a better approach than the second, and I think we could explore something in that direction, once we address the race condition first pointed out by Chris. He suggested on an earlier email that we leverage the knowledge about digital ports to improve the overall detection, but I'm not sure how to start that. I've been checking the specs and I don't see how we could decide whether we have a DP device without doing the dpcp dance. Do you have any suggestions on that? I'm new to i915, so I'm not sure if I'm missing something, if that is the case, please point it out. :)

Signature · 5 lines
Gabriel Krisman Bertazi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
In reply to Gabriel Krisman Bertazi
Quoted 39 lines · Gabriel Krisman Bertazi

On systems where more than one connector is attached to the same port, the HPD pin is also shared, and attaching one connector will trigger a hotplug on every other connector on that port. But, according to the documentation, connectors sharing the port cannot be enabled simultaneously, such that we can abort the detection process early if another connector was detected succesfully.

This has the good side effect of preventing DP timeouts whenever something else is connected to the shared port, like below:

[drm:intel_dp_aux_ch [i915]] dp_aux_ch timeout status 0x7143003f [drm:drm_dp_dpcd_access] Too many retries, giving up. First error: -110

Since this reduces the overhead of the i915_hotplug_work_func, it may address the following vblank misses detected by the CI:

https://bugs.freedesktop.org/show_bug.cgi?id=100215
https://bugs.freedesktop.org/show_bug.cgi?id=100558

---
 drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_dp.c      |  3 +++
 drivers/gpu/drm/i915/intel_drv.h     |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c    |  3 +++
 4 files changed, 33 insertions(+)
drivers/gpu/drm/i915/intel_display.c +4 -0
index 85b9e2f521a0..618b5138c0c7 100644
@@ -11270,6 +11270,32 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
 	return true;
 }
 
+bool intel_shared_digital_port_in_use(struct drm_connector *conn)
+{
+	struct drm_connector *peer;
+	struct drm_connector_list_iter iter;

drivers/gpu/drm/i915/intel_display.c static bool check_digital_port_conflicts(struct drm_atomic_state *state) · line 11286

Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10 -0
+	struct intel_encoder *enc = to_intel_connector(conn)->encoder;
+	int ret = false;
+
+	drm_connector_list_iter_begin(conn->dev, &iter);
+	drm_for_each_connector_iter(peer, &iter) {
+		struct intel_encoder *peer_enc;
+
+		if (peer == conn ||
+		    peer->status != connector_status_connected)
+			continue;

So here, you are trying to find another connector in the list
of connectors that is not same as the passed connector but it is connected, right?

drivers/gpu/drm/i915/intel_display.c static bool check_digital_port_conflicts(struct drm_atomic_state *state) · line 11291

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5 -0
+
+		peer_enc = to_intel_connector(peer)->encoder;
+		if (peer_enc->port == enc->port) {
+			ret = true;
+			break;

And the intention for this check is to see the connector that just got hotplugged is connected to the same port as the port that already has a connector connected?

How does this handle the case where displays are cloned? Guess it would be same encoder but still different ports?

Manasi

Quoted 53 lines
drivers/gpu/drm/i915/intel_display.c +7 -0
+		}
+	}
+	drm_connector_list_iter_end(&iter);
+
+	return ret;
+}
+
 static void
 clear_intel_crtc_state(struct intel_crtc_state *crtc_state)
 {
drivers/gpu/drm/i915/intel_dp.c +3 -0
index 08834f74d396..0823c588575f 100644
@@ -4628,6 +4628,9 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
 
 	WARN_ON(!drm_modeset_is_locked(&connector->dev->mode_config.connection_mutex));
 
+	if (intel_shared_digital_port_in_use(connector))
+		return connector_status_disconnected;
+
 	intel_display_power_get(to_i915(dev), intel_dp->aux_power_domain);
 
 	/* Can't disconnect eDP, but you can close the lid... */
drivers/gpu/drm/i915/intel_drv.h +1 -0
index 54f3ff840812..fd5f2517bede 100644
@@ -1411,6 +1411,7 @@ int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,
 		     const struct dpll *dpll);
 void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe);
 int lpt_get_iclkip(struct drm_i915_private *dev_priv);
+bool intel_shared_digital_port_in_use(struct drm_connector *conn);
 
 /* modesetting asserts */
 void assert_panel_unlocked(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
index 52f0b2d5fad2..9ce0b1f45cde 100644
@@ -1532,6 +1532,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
+	if (intel_shared_digital_port_in_use(connector))
+		return connector_status_disconnected;;
+
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
 	intel_hdmi_unset_edid(connector);
Signature · 1 line
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx