drm/i915/alpm: Do not use fast_wake_lines for aux less wake time

We want to have own variables for fast wake lines and aux less wake
time. It might be needed to choose if we can enable Panel Replay Selective
Update or PSR2.

Also currently aux less wake time is overwritten by calculated fast wake
time.

v2:use aux less wake time in intel_alpm_lobf_compute_config

Fixes: da6a9836ac09 ("drm/i915/psr: Calculate aux less wake time")
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240607134917.1327574-2-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
index a26716c14aa389443b2e8158ade80bfb6b9f0753..52a57336797600546db436c0b1297f76aa5eacdb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_alpm.c
+++ b/drivers/gpu/drm/i915/display/intel_alpm.c
@@ -159,7 +159,7 @@ static int _lnl_compute_aux_less_alpm_params(struct intel_dp *intel_dp,
        if (i915->display.params.psr_safest_params)
                aux_less_wake_lines = ALPM_CTL_AUX_LESS_WAKE_TIME_MASK;
 
-       intel_dp->alpm_parameters.fast_wake_lines = aux_less_wake_lines;
+       intel_dp->alpm_parameters.aux_less_wake_lines = aux_less_wake_lines;
        intel_dp->alpm_parameters.silence_period_sym_clocks = silence_period;
        intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms = lfps_half_cycle;
 
@@ -298,7 +298,7 @@ void intel_alpm_lobf_compute_config(struct intel_dp *intel_dp,
        if (intel_alpm_aux_less_wake_supported(intel_dp))
                waketime_in_lines = intel_dp->alpm_parameters.io_wake_lines;
        else
-               waketime_in_lines = intel_dp->alpm_parameters.fast_wake_lines;
+               waketime_in_lines = intel_dp->alpm_parameters.aux_less_wake_lines;
 
        crtc_state->has_lobf = (context_latency + guardband) >
                (first_sdp_position + waketime_in_lines);

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 098cabc15c7f3ec6d94c19ad7066f294dfd3151c..4ee760bd26f74802ce1984e44ddebccd717b5f62 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1854,6 +1854,7 @@ struct intel_dp {
 
                /* LNL and beyond */
                u8 check_entry_lines;
+               u8 aux_less_wake_lines;
                u8 silence_period_sym_clocks;
                u8 lfps_half_cycle_num_of_syms;
        } alpm_parameters;