Commit 39933470 authored by Jan-Marek Glogowski's avatar Jan-Marek Glogowski Committed by Rodrigo Vivi
Browse files

drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" 



This re-applies the workaround for "some DP sinks, [which] are a
little nuts" from commit 1a36147b ("drm/i915: Perform link
quality check unconditionally during long pulse").
It makes the secondary AOC E2460P monitor connected via DP to an
acer Veriton N4640G usable again.

This hunk was dropped in commit c85d200e ("drm/i915: Move SST
DP link retraining into the ->post_hotplug() hook")

Fixes: c85d200e ("drm/i915: Move SST DP link retraining into the ->post_hotplug() hook")
[Cleaned up commit message, added stable cc]
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarJan-Marek Glogowski <glogow@fbihome.de>
Cc: stable@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20180825191035.3945-1-lyude@redhat.com


(cherry picked from commit 3cf71bc9)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent f518cd94

drivers/gpu/drm/i915/intel_dp.c

+19 −14
Original line number Diff line number Diff line
@@ -4160,18 +4160,6 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) 
	return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);

}



/*

 * 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.

 */

int intel_dp_retrain_link(struct intel_encoder *encoder,

			  struct drm_modeset_acquire_ctx *ctx)

{
@@ -4661,7 +4649,8 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) 
}



static int

intel_dp_long_pulse(struct intel_connector *connector)

intel_dp_long_pulse(struct intel_connector *connector,

		    struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_dp *intel_dp = intel_attached_dp(&connector->base);
@@ -4720,6 +4709,22 @@ intel_dp_long_pulse(struct intel_connector *connector) 
		 */

		status = connector_status_disconnected;

		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.

		 */

		struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;



		intel_dp_retrain_link(encoder, ctx);

	}



	/*
@@ -4781,7 +4786,7 @@ intel_dp_detect(struct drm_connector *connector, 
				return ret;

		}



		status = intel_dp_long_pulse(intel_dp->attached_connector);

		status = intel_dp_long_pulse(intel_dp->attached_connector, ctx);

	}



	intel_dp->detect_done = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE