diff options
| author | Dhinakaran Pandiyan | 2018-09-27 22:57:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:26 +0100 |
| commit | c4b7c61cdcdcadd5b60c78b646ef62a0bf1b5713 (patch) | |
| tree | aa57a385412543cb0334fa878c3d470036e15a4a /drivers/gpu/drm/i915 | |
| parent | drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse() (diff) | |
| download | kernel-qcow2-linux-c4b7c61cdcdcadd5b60c78b646ef62a0bf1b5713.tar.gz kernel-qcow2-linux-c4b7c61cdcdcadd5b60c78b646ef62a0bf1b5713.tar.xz kernel-qcow2-linux-c4b7c61cdcdcadd5b60c78b646ef62a0bf1b5713.zip | |
drm/i915/dp: Restrict link retrain workaround to external monitors
commit f9776280c29e77a18cbc7ebb6d48f7885e494990 upstream.
Commit '3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check,
unconditionally during long pulse"")' applies a work around for sinks
that don't signal link loss. The work around does not need to have to be
that broad as the issue was seen with only one particular monitor; limit
this only for external displays as eDP features like PSR turn off the link
and the driver ends up retraining the link seeeing that link is not
synchronized.
Cc: Lyude Paul <lyude@redhat.com>
Cc: Jan-Marek Glogowski <glogow@fbihome.de>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
References: 3cf71bc9904d ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927205735.16651-2-dhinakaran.pandiyan@intel.com
(cherry picked from commit f24f6eb95807bca0dbd8dc5b2f3a4099000f4472)
Fixes: 399334708b4f ("drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse"")
Cc: stable@vger.kernel.org
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7355fd0e6925..f92079e19de8 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4739,12 +4739,13 @@ intel_dp_long_pulse(struct intel_connector *connector, */ status = connector_status_disconnected; goto out; - } else { - /* - * Some external monitors do not signal loss of link - * synchronization with an IRQ_HPD, so force a link status - * check. - */ + } + + /* + * Some external monitors do not signal loss of link synchronization + * with an IRQ_HPD, so force a link status check. + */ + if (!intel_dp_is_edp(intel_dp)) { struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; intel_dp_retrain_link(encoder, ctx); |