diff mbox series

[3/5] drm/i915: Disable LTTPR detection on GLK once again

Message ID 20210412054607.18133-4-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: Fix glk display version regressions | expand

Commit Message

Ville Syrjala April 12, 2021, 5:46 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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: 2b5a4562edd0 ("drm/i915/display: Simplify GLK display version tests")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jani Nikula April 14, 2021, 9:19 a.m. UTC | #1 
On Mon, 12 Apr 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> 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: 2b5a4562edd0 ("drm/i915/display: Simplify GLK display version tests")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> index 5e9c3c74310c..597634e4f35f 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> @@ -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,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
index 5e9c3c74310c..597634e4f35f 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
@@ -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,