> -----Original Message-----
> From: Hogander, Jouni <jouni.hogan...@intel.com>
> Sent: Tuesday, June 18, 2024 11:00 AM
> To: intel-gfx@lists.freedesktop.org
> Cc: Manna, Animesh <animesh.ma...@intel.com>; Kahola, Mika
> <mika.kah...@intel.com>; Hogander, Jouni <jouni.hogan...@intel.com>
> Subject: [PATCH 4/9] drm/i915/psr: Disable Panel Replay if PSR mode is set
> via module parameter
>
> If user is specifically limiting PSR mode to PSR1 or PSR2: disable Panel
> Replay.
> With default value -1 all modes are allowed including Panel Replay. Disabling
> PSR using value 0 disables Panel Replay as well.
>
> Also own compute config helper is added for Panel Replay. This makes sense
> because number of Panel Replay specific checks are increasing.
>
> v2: Squash adding Panel Replay compute config helper
>
> Signed-off-by: Jouni Högander <jouni.hogan...@intel.com>
Reviewed-by: Animesh Manna <animesh.ma...@intel.com>
> ---
> .../drm/i915/display/intel_display_params.c | 3 +--
> drivers/gpu/drm/i915/display/intel_psr.c | 27 +++++++++++++++++--
> 2 files changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c
> b/drivers/gpu/drm/i915/display/intel_display_params.c
> index aebdb7b59dbf..79107607a6ff 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -106,8 +106,7 @@ intel_display_param_named_unsafe(enable_fbc, int,
> 0400,
>
> intel_display_param_named_unsafe(enable_psr, int, 0400,
> "Enable PSR "
> - "(0=disabled, 1=enable up to PSR1 and Panel Replay full frame
> update, "
> - "2=enable up to PSR2 and Panel Replay Selective Update) "
> + "(0=disabled, 1=enable up to PSR1, 2=enable up to PSR2) "
> "Default: -1 (use per-chip default)");
>
> intel_display_param_named(psr_safest_params, bool, 0400, diff --git
> a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 2a33e35ceeff..cfce0fe05d92 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -235,6 +235,15 @@ static bool psr2_global_enabled(struct intel_dp
> *intel_dp)
> }
> }
>
> +static bool panel_replay_global_enabled(struct intel_dp *intel_dp) {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> +
> + if (i915->display.params.enable_psr != -1)
> + return false;
> + return true;
> +}
> +
> static u32 psr_irq_psr_error_bit_get(struct intel_dp *intel_dp) {
> struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); @@ -
> 1455,6 +1464,21 @@ static bool _psr_compute_config(struct intel_dp
> *intel_dp,
> return true;
> }
>
> +static bool _panel_replay_compute_config(struct intel_dp *intel_dp) {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> +
> + if (!CAN_PANEL_REPLAY(intel_dp))
> + return false;
> +
> + if (!panel_replay_global_enabled(intel_dp)) {
> + drm_dbg_kms(&i915->drm, "Panel Replay disabled by
> flag\n");
> + return false;
> + }
> +
> + return true;
> +}
> +
> void intel_psr_compute_config(struct intel_dp *intel_dp,
> struct intel_crtc_state *crtc_state,
> struct drm_connector_state *conn_state) @@ -
> 1490,8 +1514,7 @@ void intel_psr_compute_config(struct intel_dp
> *intel_dp,
> return;
> }
>
> - if (CAN_PANEL_REPLAY(intel_dp))
> - crtc_state->has_panel_replay = true;
> + crtc_state->has_panel_replay =
> _panel_replay_compute_config(intel_dp);
>
> crtc_state->has_psr = crtc_state->has_panel_replay ? true :
> _psr_compute_config(intel_dp, crtc_state);
> --
> 2.34.1
