> -----Original Message-----
> From: Intel-xe <intel-xe-boun...@lists.freedesktop.org> On Behalf Of Jouni
> Högander
> Sent: Thursday, January 9, 2025 1:02 PM
> To: intel-gfx@lists.freedesktop.org; intel...@lists.freedesktop.org
> Cc: Hogander, Jouni <jouni.hogan...@intel.com>
> Subject: [PATCH v3 03/10] drm/i915/psr: Split setting sff and cff bits away
> from intel_psr_force_update
>
> This is a clean-up and a preparation for adding own SFF and CFF registers for
> LunarLake onwards.
>
> Signed-off-by: Jouni Högander <jouni.hogan...@intel.com>
LGTM.
Reviewed-by: Animesh Manna <animesh.ma...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_psr.c | 88 +++++++++---------------
> 1 file changed, 31 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 5411d0d6f362..e6f96a8b4fb0 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -2313,15 +2313,6 @@ static u32
> man_trk_ctl_continuos_full_frame(struct intel_display *display) static void
> intel_psr_force_update(struct intel_dp *intel_dp) {
> struct intel_display *display = to_intel_display(intel_dp);
> - enum transcoder cpu_transcoder = intel_dp->psr.transcoder;
> -
> - if (intel_dp->psr.psr2_sel_fetch_enabled)
> - intel_de_write(display,
> - PSR2_MAN_TRK_CTL(display, cpu_transcoder),
> - man_trk_ctl_enable_bit_get(display) |
> - man_trk_ctl_partial_frame_bit_get(display) |
> - man_trk_ctl_single_full_frame_bit_get(display) |
> - man_trk_ctl_continuos_full_frame(display));
>
> /*
> * Display WA #0884: skl+
> @@ -3119,31 +3110,31 @@ static void intel_psr_work(struct work_struct
> *work)
> mutex_unlock(&intel_dp->psr.lock);
> }
>
> -static void _psr_invalidate_handle(struct intel_dp *intel_dp)
> +static void intel_psr_configure_full_frame_update(struct intel_dp
> +*intel_dp)
> {
> struct intel_display *display = to_intel_display(intel_dp);
> enum transcoder cpu_transcoder = intel_dp->psr.transcoder;
>
> - if (intel_dp->psr.psr2_sel_fetch_enabled) {
> - u32 val;
> + if (!intel_dp->psr.psr2_sel_fetch_enabled)
> + return;
>
> - if (intel_dp->psr.psr2_sel_fetch_cff_enabled) {
> - /* Send one update otherwise lag is observed in
> screen */
> - intel_de_write(display,
> - CURSURFLIVE(display, intel_dp-
> >psr.pipe),
> - 0);
> - return;
> + intel_de_write(display,
> + PSR2_MAN_TRK_CTL(display, cpu_transcoder),
> + man_trk_ctl_enable_bit_get(display) |
> + man_trk_ctl_partial_frame_bit_get(display) |
> + man_trk_ctl_single_full_frame_bit_get(display) |
> + man_trk_ctl_continuos_full_frame(display));
> +}
> +
> +static void _psr_invalidate_handle(struct intel_dp *intel_dp) {
> + if (intel_dp->psr.psr2_sel_fetch_enabled) {
> + if (!intel_dp->psr.psr2_sel_fetch_cff_enabled) {
> + intel_dp->psr.psr2_sel_fetch_cff_enabled = true;
> + intel_psr_configure_full_frame_update(intel_dp);
> }
>
> - val = man_trk_ctl_enable_bit_get(display) |
> - man_trk_ctl_partial_frame_bit_get(display) |
> - man_trk_ctl_continuos_full_frame(display);
> - intel_de_write(display,
> - PSR2_MAN_TRK_CTL(display, cpu_transcoder),
> - val);
> - intel_de_write(display,
> - CURSURFLIVE(display, intel_dp->psr.pipe), 0);
> - intel_dp->psr.psr2_sel_fetch_cff_enabled = true;
> + intel_psr_force_update(intel_dp);
> } else {
> intel_psr_exit(intel_dp);
> }
> @@ -3224,44 +3215,27 @@ static void _psr_flush_handle(struct intel_dp
> *intel_dp) {
> struct intel_display *display = to_intel_display(intel_dp);
> struct drm_i915_private *dev_priv = to_i915(display->drm);
> - enum transcoder cpu_transcoder = intel_dp->psr.transcoder;
>
> if (intel_dp->psr.psr2_sel_fetch_enabled) {
> if (intel_dp->psr.psr2_sel_fetch_cff_enabled) {
> /* can we turn CFF off? */
> - if (intel_dp->psr.busy_frontbuffer_bits == 0) {
> - u32 val =
> man_trk_ctl_enable_bit_get(display) |
> -
> man_trk_ctl_partial_frame_bit_get(display) |
> -
> man_trk_ctl_single_full_frame_bit_get(display) |
> -
> man_trk_ctl_continuos_full_frame(display);
> -
> - /*
> - * Set psr2_sel_fetch_cff_enabled as false to
> allow selective
> - * updates. Still keep cff bit enabled as we
> don't have proper
> - * SU configuration in case update is sent for
> any reason after
> - * sff bit gets cleared by the HW on next
> vblank.
> - */
> - intel_de_write(display,
> - PSR2_MAN_TRK_CTL(display,
> cpu_transcoder),
> - val);
> - intel_de_write(display,
> - CURSURFLIVE(display, intel_dp-
> >psr.pipe),
> - 0);
> + if (intel_dp->psr.busy_frontbuffer_bits == 0)
> intel_dp->psr.psr2_sel_fetch_cff_enabled =
> false;
> - }
> - } else {
> - /*
> - * continuous full frame is disabled, only a single full
> - * frame is required
> - */
> - intel_psr_force_update(intel_dp);
> }
> - } else {
> - intel_psr_force_update(intel_dp);
>
> - if (!intel_dp->psr.active && !intel_dp-
> >psr.busy_frontbuffer_bits)
> - queue_work(dev_priv->unordered_wq, &intel_dp-
> >psr.work);
> + /*
> + * Still keep cff bit enabled as we don't have proper SU
> + * configuration in case update is sent for any reason after
> + * sff bit gets cleared by the HW on next vblank.
> + */
> + intel_psr_configure_full_frame_update(intel_dp);
> }
> +
> + intel_psr_force_update(intel_dp);
> +
> + if (!intel_dp->psr.psr2_sel_fetch_enabled && !intel_dp->psr.active
> &&
> + !intel_dp->psr.busy_frontbuffer_bits)
> + queue_work(dev_priv->unordered_wq, &intel_dp-
> >psr.work);
> }
>
> /**
> --
> 2.43.0
