| Message ID | 20250403092825.484347-9-animesh.manna@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | LOBF enablement fix | expand |
On Thu, 2025-04-03 at 14:58 +0530, Animesh Manna wrote: > Disable LOBF/ALPM for any erroneous condition from sink side. > > v1: Initial version. > v2: Add centralized alpm error handling. [Jouni] > v3: Improve debug print. [Jouni] > v4: Disable alpm permanently for sink error. [Jouni] > > Signed-off-by: Animesh Manna <animesh.manna@intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> > --- > drivers/gpu/drm/i915/display/intel_alpm.c | 29 > +++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_alpm.h | 1 + > .../drm/i915/display/intel_display_types.h | 1 + > drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++ > drivers/gpu/drm/i915/display/intel_psr.c | 18 ++---------- > 5 files changed, 38 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c > b/drivers/gpu/drm/i915/display/intel_alpm.c > index 55eaf2ba996c..22a06753a760 100644 > --- a/drivers/gpu/drm/i915/display/intel_alpm.c > +++ b/drivers/gpu/drm/i915/display/intel_alpm.c > @@ -5,6 +5,7 @@ > > #include <linux/debugfs.h> > > +#include <drm/drm_print.h> > #include "intel_alpm.h" > #include "intel_crtc.h" > #include "intel_de.h" > @@ -280,6 +281,9 @@ void intel_alpm_lobf_compute_config(struct > intel_dp *intel_dp, > if (intel_dp->alpm_parameters.lobf_disable_debug) > return; > > + if (intel_dp->alpm_parameters.sink_alpm_error) > + return; > + > if (!intel_dp_is_edp(intel_dp)) > return; > > @@ -506,5 +510,30 @@ void intel_alpm_disable(struct intel_dp > *intel_dp) > PORT_ALPM_CTL(cpu_transcoder), > PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); > > + drm_dbg_kms(display->drm, "Disabling ALPM\n"); > mutex_unlock(&intel_dp->alpm_parameters.lock); > } > + > +bool intel_alpm_get_error(struct intel_dp *intel_dp) > +{ > + struct intel_display *display = to_intel_display(intel_dp); > + struct drm_dp_aux *aux = &intel_dp->aux; > + u8 val; > + int r; > + > + r = drm_dp_dpcd_readb(aux, DP_RECEIVER_ALPM_STATUS, &val); > + if (r != 1) { > + drm_err(display->drm, "Error reading ALPM > status\n"); > + return true; > + } > + > + if (val & DP_ALPM_LOCK_TIMEOUT_ERROR) { > + drm_dbg_kms(display->drm, "ALPM lock timeout > error\n"); > + > + /* Clearing error */ > + drm_dp_dpcd_writeb(aux, DP_RECEIVER_ALPM_STATUS, > val); > + return true; > + } > + > + return false; > +} > diff --git a/drivers/gpu/drm/i915/display/intel_alpm.h > b/drivers/gpu/drm/i915/display/intel_alpm.h > index 012b0b1d17ff..4f86322a9995 100644 > --- a/drivers/gpu/drm/i915/display/intel_alpm.h > +++ b/drivers/gpu/drm/i915/display/intel_alpm.h > @@ -29,4 +29,5 @@ void intel_alpm_lobf_debugfs_add(struct > intel_connector *connector); > bool intel_alpm_aux_wake_supported(struct intel_dp *intel_dp); > bool intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp); > void intel_alpm_disable(struct intel_dp *intel_dp); > +bool intel_alpm_get_error(struct intel_dp *intel_dp); > #endif > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index f7500fd1ee8c..617dcd3c2656 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1814,6 +1814,7 @@ struct intel_dp { > u8 silence_period_sym_clocks; > u8 lfps_half_cycle_num_of_syms; > bool lobf_disable_debug; > + bool sink_alpm_error; > } alpm_parameters; > > u8 alpm_dpcd; > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 0d986d624d8c..9e8cdb699248 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5393,6 +5393,11 @@ intel_dp_short_pulse(struct intel_dp > *intel_dp) > > intel_psr_short_pulse(intel_dp); > > + if (intel_alpm_get_error(intel_dp)) { > + intel_alpm_disable(intel_dp); > + intel_dp->alpm_parameters.sink_alpm_error = true; > + } > + > if (intel_dp_test_short_pulse(intel_dp)) > reprobe_needed = true; > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index 1bd2fcd0fa4b..43ed166007eb 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -3384,29 +3384,15 @@ static int > psr_get_status_and_error_status(struct intel_dp *intel_dp, > > static void psr_alpm_check(struct intel_dp *intel_dp) > { > - struct intel_display *display = to_intel_display(intel_dp); > - struct drm_dp_aux *aux = &intel_dp->aux; > struct intel_psr *psr = &intel_dp->psr; > - u8 val; > - int r; > > if (!psr->sel_update_enabled) > return; > > - r = drm_dp_dpcd_readb(aux, DP_RECEIVER_ALPM_STATUS, &val); > - if (r != 1) { > - drm_err(display->drm, "Error reading ALPM > status\n"); > - return; > - } > - > - if (val & DP_ALPM_LOCK_TIMEOUT_ERROR) { > + if (intel_alpm_get_error(intel_dp)) { > intel_psr_disable_locked(intel_dp); > psr->sink_not_reliable = true; > - drm_dbg_kms(display->drm, > - "ALPM lock timeout error, disabling > PSR\n"); > - > - /* Clearing error */ > - drm_dp_dpcd_writeb(aux, DP_RECEIVER_ALPM_STATUS, > val); > + intel_alpm_disable(intel_dp); > } > } >
diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index 55eaf2ba996c..22a06753a760 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -5,6 +5,7 @@ #include <linux/debugfs.h> +#include <drm/drm_print.h> #include "intel_alpm.h" #include "intel_crtc.h" #include "intel_de.h" @@ -280,6 +281,9 @@ void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp, if (intel_dp->alpm_parameters.lobf_disable_debug) return; + if (intel_dp->alpm_parameters.sink_alpm_error) + return; + if (!intel_dp_is_edp(intel_dp)) return; @@ -506,5 +510,30 @@ void intel_alpm_disable(struct intel_dp *intel_dp) PORT_ALPM_CTL(cpu_transcoder), PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0); + drm_dbg_kms(display->drm, "Disabling ALPM\n"); mutex_unlock(&intel_dp->alpm_parameters.lock); } + +bool intel_alpm_get_error(struct intel_dp *intel_dp) +{ + struct intel_display *display = to_intel_display(intel_dp); + struct drm_dp_aux *aux = &intel_dp->aux; + u8 val; + int r; + + r = drm_dp_dpcd_readb(aux, DP_RECEIVER_ALPM_STATUS, &val); + if (r != 1) { + drm_err(display->drm, "Error reading ALPM status\n"); + return true; + } + + if (val & DP_ALPM_LOCK_TIMEOUT_ERROR) { + drm_dbg_kms(display->drm, "ALPM lock timeout error\n"); + + /* Clearing error */ + drm_dp_dpcd_writeb(aux, DP_RECEIVER_ALPM_STATUS, val); + return true; + } + + return false; +} diff --git a/drivers/gpu/drm/i915/display/intel_alpm.h b/drivers/gpu/drm/i915/display/intel_alpm.h index 012b0b1d17ff..4f86322a9995 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.h +++ b/drivers/gpu/drm/i915/display/intel_alpm.h @@ -29,4 +29,5 @@ void intel_alpm_lobf_debugfs_add(struct intel_connector *connector); bool intel_alpm_aux_wake_supported(struct intel_dp *intel_dp); bool intel_alpm_aux_less_wake_supported(struct intel_dp *intel_dp); void intel_alpm_disable(struct intel_dp *intel_dp); +bool intel_alpm_get_error(struct intel_dp *intel_dp); #endif diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index f7500fd1ee8c..617dcd3c2656 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1814,6 +1814,7 @@ struct intel_dp { u8 silence_period_sym_clocks; u8 lfps_half_cycle_num_of_syms; bool lobf_disable_debug; + bool sink_alpm_error; } alpm_parameters; u8 alpm_dpcd; diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 0d986d624d8c..9e8cdb699248 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5393,6 +5393,11 @@ intel_dp_short_pulse(struct intel_dp *intel_dp) intel_psr_short_pulse(intel_dp); + if (intel_alpm_get_error(intel_dp)) { + intel_alpm_disable(intel_dp); + intel_dp->alpm_parameters.sink_alpm_error = true; + } + if (intel_dp_test_short_pulse(intel_dp)) reprobe_needed = true; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 1bd2fcd0fa4b..43ed166007eb 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -3384,29 +3384,15 @@ static int psr_get_status_and_error_status(struct intel_dp *intel_dp, static void psr_alpm_check(struct intel_dp *intel_dp) { - struct intel_display *display = to_intel_display(intel_dp); - struct drm_dp_aux *aux = &intel_dp->aux; struct intel_psr *psr = &intel_dp->psr; - u8 val; - int r; if (!psr->sel_update_enabled) return; - r = drm_dp_dpcd_readb(aux, DP_RECEIVER_ALPM_STATUS, &val); - if (r != 1) { - drm_err(display->drm, "Error reading ALPM status\n"); - return; - } - - if (val & DP_ALPM_LOCK_TIMEOUT_ERROR) { + if (intel_alpm_get_error(intel_dp)) { intel_psr_disable_locked(intel_dp); psr->sink_not_reliable = true; - drm_dbg_kms(display->drm, - "ALPM lock timeout error, disabling PSR\n"); - - /* Clearing error */ - drm_dp_dpcd_writeb(aux, DP_RECEIVER_ALPM_STATUS, val); + intel_alpm_disable(intel_dp); } }
Disable LOBF/ALPM for any erroneous condition from sink side. v1: Initial version. v2: Add centralized alpm error handling. [Jouni] v3: Improve debug print. [Jouni] v4: Disable alpm permanently for sink error. [Jouni] Signed-off-by: Animesh Manna <animesh.manna@intel.com> --- drivers/gpu/drm/i915/display/intel_alpm.c | 29 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_alpm.h | 1 + .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++ drivers/gpu/drm/i915/display/intel_psr.c | 18 ++---------- 5 files changed, 38 insertions(+), 16 deletions(-)