| Message ID | 20240712135724.660399-3-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915/dp: Retrain SST links via a modeset commit | expand |
On Fri, Jul 12, 2024 at 04:57:24PM +0300, Imre Deak wrote: > After a bad link state is detected, the sink capabilities with which the > link was originally trained could have changed: for instance another > sink got connected or the retraining was forced after the rate/lane count > got decreased (as a fallback). In these cases the retraining modeset > fails as expected also printing a debug message, so don't WARN on it. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 0365fb1e77eae..1e43e32e05199 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5282,14 +5282,11 @@ static int intel_dp_retrain_link(struct intel_encoder *encoder, > > void intel_dp_link_check(struct intel_encoder *encoder) > { > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > struct drm_modeset_acquire_ctx ctx; > int ret; > > intel_modeset_lock_ctx_retry(&ctx, NULL, 0, ret) > ret = intel_dp_retrain_link(encoder, &ctx); > - > - drm_WARN_ON(&i915->drm, ret); > } > > void intel_dp_check_link_state(struct intel_dp *intel_dp) > -- > 2.44.2 >
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 0365fb1e77eae..1e43e32e05199 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5282,14 +5282,11 @@ static int intel_dp_retrain_link(struct intel_encoder *encoder, void intel_dp_link_check(struct intel_encoder *encoder) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_modeset_acquire_ctx ctx; int ret; intel_modeset_lock_ctx_retry(&ctx, NULL, 0, ret) ret = intel_dp_retrain_link(encoder, &ctx); - - drm_WARN_ON(&i915->drm, ret); } void intel_dp_check_link_state(struct intel_dp *intel_dp)
After a bad link state is detected, the sink capabilities with which the link was originally trained could have changed: for instance another sink got connected or the retraining was forced after the rate/lane count got decreased (as a fallback). In these cases the retraining modeset fails as expected also printing a debug message, so don't WARN on it. Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 3 --- 1 file changed, 3 deletions(-)