Commit 36c119c1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

drm/i915: Disable LTTPR detection on GLK once again 



The glk display version change is causing us to again attempt
LTTPR detection on glk. We must not do tha since glk doesn't
have a long enough AUX timeout. Restore the correct logic to
skip the detection.

Cc: Matt Roper <matthew.d.roper@intel.com>
Fixes: 2b5a4562 ("drm/i915/display: Simplify GLK display version tests")
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210412054607.18133-4-ville.syrjala@linux.intel.com


(cherry picked from commit 543d592a)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent bc40cf6d

drivers/gpu/drm/i915/display/intel_dp_link_training.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static bool intel_dp_read_lttpr_common_caps(struct intel_dp *intel_dp) 
	 * Detecting LTTPRs must be avoided on platforms with an AUX timeout

	 * period < 3.2ms. (see DP Standard v2.0, 2.11.2, 3.6.6.1).

	 */

	if (DISPLAY_VER(i915) < 10)

	if (DISPLAY_VER(i915) < 10 || IS_GEMINILAKE(i915))

		return false;



	if (drm_dp_read_lttpr_common_caps(&intel_dp->aux,