Skip to contentSkip to conversation

drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()

PATCH Superseded Dhinakaran Pandiyan 6 participants 20 messages Sep 18, 2018 – Sep 22, 2018

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()

Comment claims link needs to be retrained because the connected sink raised a long pulse to indicate link loss. If the sink did so, intel_dp_hotplug() would have handled link retraining. Looking at the logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re-apply Perform link quality check, unconditionally during long pulse"")', the issue is that the sink does not trigger an interrupt. We want the ->detect() from user space to check link status and retrain. Ville's review for the original patch also indicates the same root cause.

I have also renamed long_pulse() to full_detect().
v2: Patch split and rewrote comment..

Cc: Lyude Paul <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +2 -10
index 436c22de33b6..cac1c7c6cbfd 100644
@@ -5074,16 +5074,8 @@ intel_dp_long_pulse(struct intel_connector *connector,
 		goto out;
 	} else {
 		/*
-		 * If display is now connected check links status,
-		 * there has been known issues of link loss triggering
-		 * long pulse.
-		 *
-		 * Some sinks (eg. ASUS PB287Q) seem to perform some
-		 * weird HPD ping pong during modesets. So we can apparently
-		 * end up with HPD going low during a modeset, and then
-		 * going back up soon after. And once that happens we must
-		 * retrain the link to get a picture. That's in case no
-		 * userspace component reacted to intermittent HPD dip.
+		 * Some monitors do not signal loss of link synchronization
+		 * with an IRQ_HPD, so force a link status check.
 		 */
 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
 
Signature · 6 lines
2.14.1

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

PATCH 2/5 drm/i915/dp: Restrict link retrain workaround to external monitors

commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")' applies a work around for monitors that don't signal link loss. Limit this only for external displays as eDP features like PSR when active will have the link turned off and the driver ends up retraining the link seeeing that link is not synchronized.

Cc: Lyude Paul <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index cac1c7c6cbfd..8bf9afa5683c 100644
@@ -5072,7 +5072,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
 		 */
 		status = connector_status_disconnected;
 		goto out;
-	} else {
+	}
+
+	if (!intel_dp_is_edp(intel_dp)) {
 		/*
 		 * Some monitors do not signal loss of link synchronization
 		 * with an IRQ_HPD, so force a link status check.
Signature · 6 lines
2.14.1

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

Re: [PATCH 2/5] drm/i915/dp: Restrict link retrain workaround to external monitors

Did the patch this references get pushed? I saw it fly by and I thought we had decided not to pull it in

Quoted 22 lines · Dhinakaran Pandiyan

commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")' applies a work around for monitors that don't signal link loss. Limit this only for external displays as eDP features like PSR when active will have the link turned off and the driver ends up retraining the link seeeing that link is not synchronized.

Cc: Lyude Paul <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index cac1c7c6cbfd..8bf9afa5683c 100644

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *connector, · line 5080

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +3 -1
@@ -5072,7 +5072,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
 		 */
 		status = connector_status_disconnected;
 		goto out;
-	} else {
+	}
+
+	if (!intel_dp_is_edp(intel_dp)) {
 		/*
 		 * Some monitors do not signal loss of link synchronization
 		 * with an IRQ_HPD, so force a link status check.

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

maintainer
#3 lore raw

Re: [PATCH 2/5] drm/i915/dp: Restrict link retrain workaround to external monitors

Quoted 2 lines · Lyude Paul

Did the patch this references get pushed? I saw it fly by and I thought we had decided not to pull it in

ops, I created the confusion. Sorry.

What I decided that week was to not pull to drm-intel-fixes until Ville or Jani acking. But it was already part of dinq, so moving to drm-next and I didn't removed or reverted it.

So... But ville acked on irc and I pulled to -fixes on the following week as well.

So yes, patch is there ;)

Quoted 31 lines · Dhinakaran Pandiyan
Quoted 29 lines

commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")' applies a work around for monitors that don't signal link loss. Limit this only for external displays as eDP features like PSR when active will have the link turned off and the driver ends up retraining the link seeeing that link is not synchronized.

Cc: Lyude Paul <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index cac1c7c6cbfd..8bf9afa5683c 100644
@@ -5072,7 +5072,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
 		 */
 		status = connector_status_disconnected;
 		goto out;
-	} else {
+	}
+
+	if (!intel_dp_is_edp(intel_dp)) {
Quoted 8 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *connector, · line 5080

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		/*
 		 * Some monitors do not signal loss of link synchronization
 		 * with an IRQ_HPD, so force a link status check.

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

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

#4 lore raw

Re: [PATCH 2/5] drm/i915/dp: Restrict link retrain workaround to external monitors

Quoted 5 lines · Rodrigo Vivi
Quoted 3 lines · Lyude Paul

Did the patch this references get pushed? I saw it fly by and I thought we had
decided not to pull it in

Quoted 7 lines

ops, I created the confusion. Sorry.

What I decided that week was to not pull to drm-intel-fixes until Ville
or Jani acking. But it was already part of dinq, so moving to drm- next
and I didn't removed or reverted it.

I would have preferred to limit this work around to the specific monitor it was needed for. The next best thing is to at least limit it to external monitors? The code adds a bunch of extra dpcd reads to check link status and acquires locks whenever user spaces wants a ->detect() and most sinks do not need this.

Let me know what your thoughts are.

-DK

Quoted 57 lines

So... But ville acked on irc and I pulled to -fixes on the following week
as well.

So yes, patch is there ;)

Quoted 50 lines · Dhinakaran Pandiyan
Quoted 40 lines

commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
unconditionally during long pulse"")' applies a work around for monitors
that don't signal link loss. Limit this only for external displays as
eDP features like PSR when active will have the link turned off and the
driver ends up retraining the link seeeing that link is not synchronized.

Cc: Lyude Paul <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
unconditionally during long pulse"")

Quoted 1 line
---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index cac1c7c6cbfd..8bf9afa5683c 100644
@@ -5072,7 +5072,9 @@ intel_dp_long_pulse(struct intel_connector
 *connector,
 		 */
 		status = connector_status_disconnected;
 		goto out;
-	} else {
+	}
+
+	if (!intel_dp_is_edp(intel_dp)) {
 		/*
 		 * Some monitors do not signal loss of link
Quoted 3 lines

synchronization
* with an IRQ_HPD, so force a link status
check.

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

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

#5 lore raw

Re: [PATCH 2/5] drm/i915/dp: Restrict link retrain workaround to external monitors

SGTM

Quoted 20 lines · Dhinakaran
Quoted 5 lines · Rodrigo Vivi
Quoted 3 lines · Lyude Paul

Did the patch this references get pushed? I saw it fly by and I thought we had
decided not to pull it in

Quoted 7 lines

ops, I created the confusion. Sorry.

What I decided that week was to not pull to drm-intel-fixes until Ville
or Jani acking. But it was already part of dinq, so moving to drm- next
and I didn't removed or reverted it.

I would have preferred to limit this work around to the specific monitor it was needed for. The next best thing is to at least limit it to external monitors? The code adds a bunch of extra dpcd reads to check link status and acquires locks whenever user spaces wants a ->detect() and most sinks do not need this.

Quoted 63 lines

Let me know what your thoughts are.

-DK

Quoted 58 lines

So... But ville acked on irc and I pulled to -fixes on the following week
as well.

So yes, patch is there ;)

Quoted 51 lines · Dhinakaran Pandiyan
Quoted 41 lines

commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
unconditionally during long pulse"")' applies a work around for monitors
that don't signal link loss. Limit this only for external displays as
eDP features like PSR when active will have the link turned off and the
driver ends up retraining the link seeeing that link is not synchronized.

Cc: Lyude Paul <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
unconditionally during long pulse"")

Quoted 1 line
---
 drivers/gpu/drm/i915/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index cac1c7c6cbfd..8bf9afa5683c 100644
@@ -5072,7 +5072,9 @@ intel_dp_long_pulse(struct intel_connector
 *connector,
 		 */
 		status = connector_status_disconnected;
 		goto out;
-	} else {
+	}
+
+	if (!intel_dp_is_edp(intel_dp)) {
 		/*
 		 * Some monitors do not signal loss of link
Quoted 3 lines

synchronization
* with an IRQ_HPD, so force a link status
check.

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

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

#6 lore raw

PATCH 3/5 drm/i915/dp: Remove intel_dp->detect_done flag

In reply to Dhinakaran Pandiyan

The intel_dp->detect_done flag is no more useful. Pull intel_dp_long_pulse() into the lone caller,

Cc Jani Nikula <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c  | 63 +++++++++++++---------------------------
 drivers/gpu/drm/i915/intel_drv.h |  1 -
 2 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +20 -43
index 8bf9afa5683c..d06bf4303814 100644
@@ -5012,13 +5012,25 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 }
 
 static int
-intel_dp_long_pulse(struct intel_connector *connector,
-		    struct drm_modeset_acquire_ctx *ctx)
+intel_dp_detect(struct drm_connector *connector,
+		struct drm_modeset_acquire_ctx *ctx,
+		bool force)
 {
-	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
-	struct intel_dp *intel_dp = intel_attached_dp(&connector->base);
-	enum drm_connector_status status;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_dp *intel_dp = intel_attached_dp(connector);
+	int status;
 	u8 sink_irq_vector = 0;
+	struct drm_crtc *crtc;
+
+	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
+		      connector->base.id, connector->name);
+
+	crtc = connector->state->crtc;
+	if (crtc) {
+		status = drm_modeset_lock(&crtc->mutex, ctx);
+		if (status)
+			return status;
+	}
 
 	WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
 
@@ -5093,9 +5105,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
 	intel_dp->aux.i2c_defer_count = 0;
 
 	intel_dp_set_edid(intel_dp);
-	if (intel_dp_is_edp(intel_dp) || connector->detect_edid)
+	if (intel_dp_is_edp(intel_dp) ||
+	    to_intel_connector(connector)->detect_edid)
 		status = connector_status_connected;
-	intel_dp->detect_done = true;
 
 	/* Try to read the source of the interrupt */
 	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
@@ -5120,37 +5132,6 @@ intel_dp_long_pulse(struct intel_connector *connector,
 	return status;
 }
 
-static int
-intel_dp_detect(struct drm_connector *connector,
-		struct drm_modeset_acquire_ctx *ctx,
-		bool force)
-{
-	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	int status = connector->status;
-
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-		      connector->base.id, connector->name);
-
-	/* If full detect is not performed yet, do a full detect */
-	if (!intel_dp->detect_done) {
-		struct drm_crtc *crtc;
-		int ret;
-
-		crtc = connector->state->crtc;
-		if (crtc) {
-			ret = drm_modeset_lock(&crtc->mutex, ctx);
-			if (ret)
-				return ret;
-		}
-
-		status = intel_dp_long_pulse(intel_dp->attached_connector, ctx);
-	}
-
-	intel_dp->detect_done = false;
-
-	return status;
-}
-
 static void
 intel_dp_force(struct drm_connector *connector)
 {
@@ -5643,7 +5624,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
 	if (long_hpd) {
 		intel_dp->reset_link_params = true;
-		intel_dp->detect_done = false;
 		return IRQ_NONE;
 	}
 
@@ -5660,7 +5640,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 			intel_dp->is_mst = false;
 			drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
 							intel_dp->is_mst);
-			intel_dp->detect_done = false;
 			goto put_power;
 		}
 	}
@@ -5673,10 +5652,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 		/* Short pulse can signify loss of hdcp authentication */
 		intel_hdcp_check_link(intel_dp->attached_connector);
 
-		if (!handled) {
-			intel_dp->detect_done = false;
+		if (!handled)
 			goto put_power;
-		}
 	}
 
 	ret = IRQ_HANDLED;
drivers/gpu/drm/i915/intel_drv.h +0 -1
index bf1c38728a59..c7206a4764e5 100644
@@ -1070,7 +1070,6 @@ struct intel_dp {
 	bool link_mst;
 	bool link_trained;
 	bool has_audio;
-	bool detect_done;
 	bool reset_link_params;
 	enum aux_ch aux_ch;
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
Signature · 6 lines
2.14.1

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

Re: [PATCH 3/5] drm/i915/dp: Remove intel_dp->detect_done flag

Quoted 30 lines · Dhinakaran Pandiyan

The intel_dp->detect_done flag is no more useful. Pull intel_dp_long_pulse() into the lone caller,

Cc Jani Nikula <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c  | 63 +++++++++++++---------------------------
 drivers/gpu/drm/i915/intel_drv.h |  1 -
 2 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +5 -5
index 8bf9afa5683c..d06bf4303814 100644
@@ -5012,13 +5012,25 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 }
 
 static int
-intel_dp_long_pulse(struct intel_connector *connector,
-		    struct drm_modeset_acquire_ctx *ctx)
+intel_dp_detect(struct drm_connector *connector,
+		struct drm_modeset_acquire_ctx *ctx,
+		bool force)
 {
-	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
-	struct intel_dp *intel_dp = intel_attached_dp(&connector->base);
-	enum drm_connector_status status;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_dp *intel_dp = intel_attached_dp(connector);

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 5030

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
+	int status;
 	u8 sink_irq_vector = 0;
+	struct drm_crtc *crtc;
+
+	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
+		      connector->base.id, connector->name);
+
+	crtc = connector->state->crtc;
+	if (crtc) {
+		status = drm_modeset_lock(&crtc->mutex, ctx);

The 'status' name looks a bit weird here. I'm leaning towards keeping the 'int ret' for this case.

Hmm. Actually, why are we even taking this lock here anyway? I would imagine we only need it for the link retraining and intel_dp_retrain_link() already grabs it so we should be able to just drop this code. Would allow page flips and detect to execute in parallel again.

Quoted 98 lines
drivers/gpu/drm/i915/intel_dp.c +6 -38
+		if (status)
+			return status;
+	}
 
 	WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
 
@@ -5093,9 +5105,9 @@ intel_dp_long_pulse(struct intel_connector *connector,
 	intel_dp->aux.i2c_defer_count = 0;
 
 	intel_dp_set_edid(intel_dp);
-	if (intel_dp_is_edp(intel_dp) || connector->detect_edid)
+	if (intel_dp_is_edp(intel_dp) ||
+	    to_intel_connector(connector)->detect_edid)
 		status = connector_status_connected;
-	intel_dp->detect_done = true;
 
 	/* Try to read the source of the interrupt */
 	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
@@ -5120,37 +5132,6 @@ intel_dp_long_pulse(struct intel_connector *connector,
 	return status;
 }
 
-static int
-intel_dp_detect(struct drm_connector *connector,
-		struct drm_modeset_acquire_ctx *ctx,
-		bool force)
-{
-	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	int status = connector->status;
-
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-		      connector->base.id, connector->name);
-
-	/* If full detect is not performed yet, do a full detect */
-	if (!intel_dp->detect_done) {
-		struct drm_crtc *crtc;
-		int ret;
-
-		crtc = connector->state->crtc;
-		if (crtc) {
-			ret = drm_modeset_lock(&crtc->mutex, ctx);
-			if (ret)
-				return ret;
-		}
-
-		status = intel_dp_long_pulse(intel_dp->attached_connector, ctx);
-	}
-
-	intel_dp->detect_done = false;
-
-	return status;
-}
-
 static void
 intel_dp_force(struct drm_connector *connector)
 {
@@ -5643,7 +5624,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
 	if (long_hpd) {
 		intel_dp->reset_link_params = true;
-		intel_dp->detect_done = false;
 		return IRQ_NONE;
 	}
 
@@ -5660,7 +5640,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 			intel_dp->is_mst = false;
 			drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
 							intel_dp->is_mst);
-			intel_dp->detect_done = false;
 			goto put_power;
 		}
 	}
@@ -5673,10 +5652,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 		/* Short pulse can signify loss of hdcp authentication */
 		intel_hdcp_check_link(intel_dp->attached_connector);
 
-		if (!handled) {
-			intel_dp->detect_done = false;
+		if (!handled)
 			goto put_power;
-		}
 	}
 
 	ret = IRQ_HANDLED;
drivers/gpu/drm/i915/intel_drv.h +0 -1
index bf1c38728a59..c7206a4764e5 100644
@@ -1070,7 +1070,6 @@ struct intel_dp {
 	bool link_mst;
 	bool link_trained;
 	bool has_audio;
-	bool detect_done;
 	bool reset_link_params;
 	enum aux_ch aux_ch;
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
Signature · 1 line
2.14.1
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

Re: [PATCH 3/5] drm/i915/dp: Remove intel_dp->detect_done flag

Quoted 36 lines · Ville Syrjälä
Quoted 35 lines · Dhinakaran Pandiyan

The intel_dp->detect_done flag is no more useful. Pull intel_dp_long_pulse() into the lone caller,

Cc Jani Nikula <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/intel_dp.c  | 63 +++++++++++++---------------
------------
 drivers/gpu/drm/i915/intel_drv.h |  1 -
 2 files changed, 20 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +4 -5
index 8bf9afa5683c..d06bf4303814 100644
@@ -5012,13 +5012,25 @@ intel_dp_unset_edid(struct intel_dp
 *intel_dp)
 }
 
 static int
-intel_dp_long_pulse(struct intel_connector *connector,
-		    struct drm_modeset_acquire_ctx *ctx)
+intel_dp_detect(struct drm_connector *connector,
+		struct drm_modeset_acquire_ctx *ctx,
+		bool force)
 {
-	struct drm_i915_private *dev_priv = to_i915(connector-
 >base.dev);
-	struct intel_dp *intel_dp = intel_attached_dp(&connector-
 >base);
-	enum drm_connector_status status;
+	struct drm_i915_private *dev_priv = to_i915(connector-
 >dev);
Quoted 14 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 5030

Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +10 -0
+	struct intel_dp *intel_dp = intel_attached_dp(connector);
+	int status;
 	u8 sink_irq_vector = 0;
+	struct drm_crtc *crtc;
+
+	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
+		      connector->base.id, connector->name);
+
+	crtc = connector->state->crtc;
+	if (crtc) {
+		status = drm_modeset_lock(&crtc->mutex, ctx);

The 'status' name looks a bit weird here. I'm leaning towards keeping the 'int ret' for this case.

It does indeed, just wanted to reuse the local variable. Will change it in the next version.

Quoted 7 lines

Hmm. Actually, why are we even taking this lock here anyway? I would imagine we only need it for the link retraining and intel_dp_retrain_link() already grabs it so we should be able to just drop this code. Would allow page flips and detect to execute in parallel again.

Looks like the code wasn't updated when intel_dp_retrain_link() started grabbing the locks.

Quoted 95 lines
Quoted 95 lines
drivers/gpu/drm/i915/intel_dp.c +3 -0
+		if (status)
+			return status;
+	}
 
 	WARN_ON(!drm_modeset_is_locked(&dev_priv-
Quoted 1 line

drm.mode_config.connection_mutex));

drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -5093,9 +5105,9 @@ intel_dp_long_pulse(struct intel_connector
 *connector,
 	intel_dp->aux.i2c_defer_count = 0;
 
 	intel_dp_set_edid(intel_dp);
-	if (intel_dp_is_edp(intel_dp) || connector->detect_edid)
+	if (intel_dp_is_edp(intel_dp) ||
+	    to_intel_connector(connector)->detect_edid)
 		status = connector_status_connected;
-	intel_dp->detect_done = true;
 
 	/* Try to read the source of the interrupt */
drivers/gpu/drm/i915/intel_dp.c +0 -31
 	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
@@ -5120,37 +5132,6 @@ intel_dp_long_pulse(struct intel_connector
 *connector,
 	return status;
 }
 
-static int
-intel_dp_detect(struct drm_connector *connector,
-		struct drm_modeset_acquire_ctx *ctx,
-		bool force)
-{
-	struct intel_dp *intel_dp = intel_attached_dp(connector);
-	int status = connector->status;
-
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
-		      connector->base.id, connector->name);
-
-	/* If full detect is not performed yet, do a full detect
 */
-	if (!intel_dp->detect_done) {
-		struct drm_crtc *crtc;
-		int ret;
-
-		crtc = connector->state->crtc;
-		if (crtc) {
-			ret = drm_modeset_lock(&crtc->mutex, ctx);
-			if (ret)
-				return ret;
-		}
-
-		status = intel_dp_long_pulse(intel_dp-
 >attached_connector, ctx);
-	}
-
-	intel_dp->detect_done = false;
-
-	return status;
-}
-

static void
intel_dp_force(struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_dp.c +0 -2
@@ -5643,7 +5624,6 @@ intel_dp_hpd_pulse(struct intel_digital_port
 *intel_dig_port, bool long_hpd)
 
 	if (long_hpd) {
 		intel_dp->reset_link_params = true;
-		intel_dp->detect_done = false;
 		return IRQ_NONE;
 	}
@@ -5660,7 +5640,6 @@ intel_dp_hpd_pulse(struct intel_digital_port
 *intel_dig_port, bool long_hpd)
 			intel_dp->is_mst = false;
 			drm_dp_mst_topology_mgr_set_mst(&intel_dp-
 >mst_mgr,
 							intel_dp-
 >is_mst);
-			intel_dp->detect_done = false;
drivers/gpu/drm/i915/intel_dp.c +0 -0
 			goto put_power;
 		}
 	}
@@ -5673,10 +5652,8 @@ intel_dp_hpd_pulse(struct intel_digital_port
 *intel_dig_port, bool long_hpd)
 		/* Short pulse can signify loss of hdcp

authentication */
intel_hdcp_check_link(intel_dp-

Quoted 1 line

attached_connector);

drivers/gpu/drm/i915/intel_dp.c +1 -3
-		if (!handled) {
-			intel_dp->detect_done = false;
+		if (!handled)
 			goto put_power;
-		}
 	}
Quoted 18 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	ret = IRQ_HANDLED;
drivers/gpu/drm/i915/intel_drv.h +0 -1
index bf1c38728a59..c7206a4764e5 100644
@@ -1070,7 +1070,6 @@ struct intel_dp {
 	bool link_mst;
 	bool link_trained;
 	bool has_audio;
-	bool detect_done;
 	bool reset_link_params;
 	enum aux_ch aux_ch;
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
Signature · 1 line
2.14.1

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

#9 lore raw

PATCH 4/5 drm/i915/dp: Fix duplication of DEVICE_SERVICE_IRQ handling

In reply to Dhinakaran Pandiyan

There are two copies of the same code called from long and short pulse handlers.

---
 drivers/gpu/drm/i915/intel_dp.c | 59 +++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +22 -37
index d06bf4303814..123c2eafafab 100644
@@ -4038,13 +4038,6 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
 					intel_dp->is_mst);
 }
 
-static bool
-intel_dp_get_sink_irq(struct intel_dp *intel_dp, u8 *sink_irq_vector)
-{
-	return drm_dp_dpcd_readb(&intel_dp->aux, DP_DEVICE_SERVICE_IRQ_VECTOR,
-				 sink_irq_vector) == 1;
-}
-
 static bool
 intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector)
 {
@@ -4432,6 +4425,26 @@ static bool intel_dp_hotplug(struct intel_encoder *encoder,
 	return changed;
 }
 
+static void intel_dp_check_service_irq(struct intel_dp *intel_dp)
+{
+	u8 val;
+
+	if (intel_dp->dpcd[DP_DPCD_REV] < 0x11)
+		return;
+
+	if (drm_dp_dpcd_readb(&intel_dp->aux,
+			      DP_DEVICE_SERVICE_IRQ_VECTOR, &val) != 1 || !val)
+		return;
+
+	drm_dp_dpcd_writeb(&intel_dp->aux, DP_DEVICE_SERVICE_IRQ_VECTOR, val);
+
+	if (val & DP_AUTOMATED_TEST_REQUEST)
+		intel_dp_handle_test_request(intel_dp);
+
+	if (val & (DP_CP_IRQ | DP_SINK_SPECIFIC_IRQ))
+		DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
+}
+
 /*
  * According to DP spec
  * 5.1.2:
@@ -4449,7 +4462,6 @@ static bool
 intel_dp_short_pulse(struct intel_dp *intel_dp)
 {
 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
-	u8 sink_irq_vector = 0;
 	u8 old_sink_count = intel_dp->sink_count;
 	bool ret;
 
@@ -4472,20 +4484,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
 		return false;
 	}
 
-	/* Try to read the source of the interrupt */
-	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
-	    intel_dp_get_sink_irq(intel_dp, &sink_irq_vector) &&
-	    sink_irq_vector != 0) {
-		/* Clear interrupt source */
-		drm_dp_dpcd_writeb(&intel_dp->aux,
-				   DP_DEVICE_SERVICE_IRQ_VECTOR,
-				   sink_irq_vector);
-
-		if (sink_irq_vector & DP_AUTOMATED_TEST_REQUEST)
-			intel_dp_handle_test_request(intel_dp);
-		if (sink_irq_vector & (DP_CP_IRQ | DP_SINK_SPECIFIC_IRQ))
-			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
-	}
+	intel_dp_check_service_irq(intel_dp);
 
 	/* Handle CEC interrupts, if any */
 	drm_dp_cec_irq(&intel_dp->aux);
@@ -5019,7 +5018,6 @@ intel_dp_detect(struct drm_connector *connector,
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
 	int status;
-	u8 sink_irq_vector = 0;
 	struct drm_crtc *crtc;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -5109,20 +5107,7 @@ intel_dp_detect(struct drm_connector *connector,
 	    to_intel_connector(connector)->detect_edid)
 		status = connector_status_connected;
 
-	/* Try to read the source of the interrupt */
-	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
-	    intel_dp_get_sink_irq(intel_dp, &sink_irq_vector) &&
-	    sink_irq_vector != 0) {
-		/* Clear interrupt source */
-		drm_dp_dpcd_writeb(&intel_dp->aux,
-				   DP_DEVICE_SERVICE_IRQ_VECTOR,
-				   sink_irq_vector);
-
-		if (sink_irq_vector & DP_AUTOMATED_TEST_REQUEST)
-			intel_dp_handle_test_request(intel_dp);
-		if (sink_irq_vector & (DP_CP_IRQ | DP_SINK_SPECIFIC_IRQ))
-			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
-	}
+	intel_dp_check_service_irq(intel_dp);
 
 out:
 	if (status != connector_status_connected && !intel_dp->is_mst)
Signature · 6 lines
2.14.1

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

PATCH 5/5 drm/i915/dp: Move hdcp link check function into short pulse handler

In reply to Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -3
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;
 }
 
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp authentication */
-		intel_hdcp_check_link(intel_dp->attached_connector);
-
 		if (!handled)
 			goto put_power;
 	}
Signature · 6 lines
2.14.1

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

Re: [PATCH 5/5] drm/i915/dp: Move hdcp link check function into short pulse handler

Quoted 22 lines · Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;
 }
 

drivers/gpu/drm/i915/intel_dp.c intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) · line 5639

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +0 -3
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp authentication */
-		intel_hdcp_check_link(intel_dp->attached_connector);
-

This changes the behaviour to skip intel_hdcp_check_link() when intel_dp_short_pulse() decides to fall back to full detect. Not sure if that's OK or not.

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		if (!handled)
 			goto put_power;
 	}
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

Re: [PATCH 5/5] drm/i915/dp: Move hdcp link check function into short pulse handler

Quoted 32 lines · Ville Syrjälä
Quoted 31 lines · Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp
 *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;
 }
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct intel_digital_port
 *intel_dig_port, bool long_hpd)
 
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp

authentication */

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		intel_hdcp_check_link(intel_dp-
Quoted 7 lines
Quoted 2 lines
Quoted 1 line

attached_connector);

-

This changes the behaviour to skip intel_hdcp_check_link() when intel_dp_short_pulse() decides to fall back to full detect. Not sure if
that's OK or not.

I'm thinking we should move the decision to fallback to the very end of intel_dp_short_pulse().

The benefit we get is to disable PSR if the sink complained of PSR errors and then check if the hardware retrained the link correctly after we disabled.

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		if (!handled)
 			goto put_power;
 	}
Signature · 1 line
2.14.1
Quoted 6 lines
Quoted 4 lines

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

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

#13 lore raw

Re: [PATCH 5/5] drm/i915/dp: Move hdcp link check function into short pulse handler

Quoted 36 lines · Dhinakaran
Quoted 35 lines · Ville Syrjälä
Quoted 33 lines · Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -1
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp
 *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;
 }
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct intel_digital_port
 *intel_dig_port, bool long_hpd)
 
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp

authentication */

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		intel_hdcp_check_link(intel_dp-
Quoted 1 line

attached_connector);

-

Quoted 7 lines
Quoted 4 lines

This changes the behaviour to skip intel_hdcp_check_link() when intel_dp_short_pulse() decides to fall back to full detect. Not sure if
that's OK or not.

I'm thinking we should move the decision to fallback to the very end of intel_dp_short_pulse().

Perhaps. The entire "how do we process hpd_irqs correctly?" thing needs some real thought.

Quoted 19 lines

The benefit we get is to disable PSR if the sink complained of PSR errors and then check if the hardware retrained the link correctly after we disabled.

Quoted 13 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		if (!handled)
 			goto put_power;
 	}
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw

Re: [PATCH 5/5] drm/i915/dp: Move hdcp link check function into short pulse handler

Quoted 48 lines · Ville Syrjälä
Quoted 47 lines · Dhinakaran
Quoted 45 lines · Ville Syrjälä
Quoted 36 lines · Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

om>

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp
 *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication
 */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;

}

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct

intel_digital_port
*intel_dig_port, bool long_hpd)

drivers/gpu/drm/i915/intel_dp.c +0 -1
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp

authentication */

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		intel_hdcp_check_link(intel_dp-
Quoted 1 line

attached_connector);

Quoted 1 line

-

This changes the behaviour to skip intel_hdcp_check_link() when intel_dp_short_pulse() decides to fall back to full detect. Not sure
if
that's OK or not.

Quoted 6 lines
Quoted 3 lines

I'm thinking we should move the decision to fallback to the very end of
intel_dp_short_pulse().

Perhaps. The entire "how do we process hpd_irqs correctly?" thing needs some real thought.

One noteworthy information I remember from my last reading of the spec is that the sink is required to generate a distinct IRQ_HPD to request retraining. But then, if we get two interrupts in quick succession, a queued work item will end up handling both.

Quoted 14 lines
Quoted 14 lines

The benefit we get is to disable PSR if the sink complained of PSR errors and then check if the hardware retrained the link correctly after we disabled.

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		if (!handled)
 			goto put_power;
 	}
Signature · 1 line
2.14.1
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines

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

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

#15 lore raw

Re: [PATCH 5/5] drm/i915/dp: Move hdcp link check function into short pulse handler

In reply to Ville Syrjälä
Quoted 48 lines · Ville Syrjälä
Quoted 47 lines · Dhinakaran
Quoted 45 lines · Ville Syrjälä
Quoted 36 lines · Dhinakaran Pandiyan

This way all short pulse handlers except MST are in one place.

om>

---
 drivers/gpu/drm/i915/intel_dp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index 123c2eafafab..03d2c6426016 100644
@@ -4501,6 +4501,9 @@ intel_dp_short_pulse(struct intel_dp
 *intel_dp)
 		drm_kms_helper_hotplug_event(&dev_priv->drm);
 	}
 
+	/* Short pulse can signify loss of hdcp authentication
 */
+	intel_hdcp_check_link(intel_dp->attached_connector);
+
 	return true;

}

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -5634,9 +5637,6 @@ intel_dp_hpd_pulse(struct

intel_digital_port
*intel_dig_port, bool long_hpd)

drivers/gpu/drm/i915/intel_dp.c +0 -1
 		handled = intel_dp_short_pulse(intel_dp);
 
-		/* Short pulse can signify loss of hdcp

authentication */

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		intel_hdcp_check_link(intel_dp-
Quoted 1 line

attached_connector);

Quoted 1 line

-

This changes the behaviour to skip intel_hdcp_check_link() when intel_dp_short_pulse() decides to fall back to full detect. Not sure
if
that's OK or not.

Quoted 6 lines
Quoted 3 lines

I'm thinking we should move the decision to fallback to the very end of
intel_dp_short_pulse().

Perhaps. The entire "how do we process hpd_irqs correctly?" thing needs some real thought.

One noteworthy information I remember from my last reading of the spec is that the sink is required to generate a distinct IRQ_HPD to request retraining. But then, if we get two interrupts in quick succession, a queued work item will end up handling both.

Quoted 14 lines
Quoted 14 lines

The benefit we get is to disable PSR if the sink complained of PSR errors and then check if the hardware retrained the link correctly after we disabled.

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +0 -0
 		if (!handled)
 			goto put_power;
 	}
Signature · 1 line
2.14.1
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines

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

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

#16 lore raw

✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()
URL : https://patchwork.freedesktop.org/series/49827/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
b03548d38052 drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()
-:27: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#27: 
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

-:27: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")' #27:
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

total: 1 errors, 1 warnings, 0 checks, 18 lines checked
2725094c4d5a drm/i915/dp: Restrict link retrain workaround to external monitors
-:20: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #20:
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

-:20: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")' #20:
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

total: 1 errors, 1 warnings, 0 checks, 10 lines checked 33bb993204ea drm/i915/dp: Remove intel_dp->detect_done flag 5872eb154e8c drm/i915/dp: Fix duplication of DEVICE_SERVICE_IRQ handling c7ba164dc462 drm/i915/dp: Move hdcp link check function into short pulse handler

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

#17 lore raw

✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()
URL : https://patchwork.freedesktop.org/series/49827/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4835 -> Patchwork_10209 =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_10209 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10209, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/49827/revisions/1/mbox/

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_10209:

=== IGT changes ===

    ==== Possible regressions ====

    igt@gem_exec_fence@basic-busy-default:
      fi-bdw-samus:       NOTRUN -> DMESG-WARN

== Participating hosts (45 -> 41) ==

Additional (1): fi-bdw-samus
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4835 -> Patchwork_10209

CI_DRM_4835: 0875e7885717d3d812941e8e2db1dc99728be1ff @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4645: 03b90a39ed12a568c9da752466ea708d6348e110 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10209: c7ba164dc4626568faf4a1c4f2d51caebb2bc9d3 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

c7ba164dc462 drm/i915/dp: Move hdcp link check function into short pulse handler 5872eb154e8c drm/i915/dp: Fix duplication of DEVICE_SERVICE_IRQ handling 33bb993204ea drm/i915/dp: Remove intel_dp->detect_done flag 2725094c4d5a drm/i915/dp: Restrict link retrain workaround to external monitors b03548d38052 drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10209/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#18 lore raw
In reply to Dhinakaran Pandiyan
Quoted 10 lines · Dhinakaran Pandiyan

Comment claims link needs to be retrained because the connected sink raised a long pulse to indicate link loss. If the sink did so, intel_dp_hotplug() would have handled link retraining. Looking at the logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re-apply Perform link quality check, unconditionally during long pulse"")', the issue is that the sink does not trigger an interrupt. We want the ->detect() from user space to check link status and retrain. Ville's review for the original patch also indicates the same root cause.

I have also renamed long_pulse() to full_detect().

have you?!
I just see the comment change on this patch ;)

Quoted 43 lines

v2: Patch split and rewrote comment..

Cc: Lyude Paul <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +2 -10
index 436c22de33b6..cac1c7c6cbfd 100644
@@ -5074,16 +5074,8 @@ intel_dp_long_pulse(struct intel_connector *connector,
 		goto out;
 	} else {
 		/*
-		 * If display is now connected check links status,
-		 * there has been known issues of link loss triggering
-		 * long pulse.
-		 *
-		 * Some sinks (eg. ASUS PB287Q) seem to perform some
-		 * weird HPD ping pong during modesets. So we can apparently
-		 * end up with HPD going low during a modeset, and then
-		 * going back up soon after. And once that happens we must
-		 * retrain the link to get a picture. That's in case no
-		 * userspace component reacted to intermittent HPD dip.
+		 * Some monitors do not signal loss of link synchronization
+		 * with an IRQ_HPD, so force a link status check.
 		 */
 		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
 
Signature · 6 lines
2.14.1

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

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

#19 lore raw
Quoted 15 lines · Rodrigo Vivi
Quoted 14 lines · Dhinakaran Pandiyan

Comment claims link needs to be retrained because the connected sink raised
a long pulse to indicate link loss. If the sink did so, intel_dp_hotplug() would have handled link retraining. Looking at the
logs in Bugzilla referenced in commit '3cf71bc9904d ("drm/i915: Re- apply
Perform link quality check, unconditionally during long pulse"")', the
issue is that the sink does not trigger an interrupt. We want the ->detect() from user space to check link status and retrain. Ville's
review for the original patch also indicates the same root cause.

Quoted 7 lines
Quoted 1 line

I have also renamed long_pulse() to full_detect().

have you?!
I just see the comment change on this patch ;)

Quoted 1 line

v2: Patch split and rewrote comment..

I split the renaming part. I'll rewrite the commit message if you want me to.

Quoted 47 lines
Quoted 47 lines

Cc: Lyude Paul <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Jan-Marek Glogowski <[email protected]>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")

---
 drivers/gpu/drm/i915/intel_dp.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -2
index 436c22de33b6..cac1c7c6cbfd 100644
@@ -5074,16 +5074,8 @@ intel_dp_long_pulse(struct intel_connector
 *connector,
 		goto out;
 	} else {
 		/*
-		 * If display is now connected check links status,
-		 * there has been known issues of link loss

triggering

drivers/gpu/drm/i915/intel_dp.c +0 -3
-		 * long pulse.
-		 *
-		 * Some sinks (eg. ASUS PB287Q) seem to perform

some

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		 * weird HPD ping pong during modesets. So we can

apparently

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		 * end up with HPD going low during a modeset, and

then

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		 * going back up soon after. And once that happens

we must

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		 * retrain the link to get a picture. That's in

case no

drivers/gpu/drm/i915/intel_dp.c +0 -1
-		 * userspace component reacted to intermittent HPD

dip.

drivers/gpu/drm/i915/intel_dp.c +1 -0
+		 * Some monitors do not signal loss of link

synchronization

drivers/gpu/drm/i915/intel_dp.c +1 -0
+		 * with an IRQ_HPD, so force a link status check.
 		 */
 		struct intel_encoder *encoder =

&dp_to_dig_port(intel_dp)->base;

Quoted 7 lines
Quoted 7 lines
Signature · 6 lines
2.14.1

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

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