[PATCH v6 07/12] drm/i915/psr: Changes for PSR2_MAN_TRK_CTL handling when DSB is in use

[Hogander, Jouni]

On Mon, 2025-02-10 at 18:26 +0200, Ville Syrjälä wrote:
> On Mon, Jan 27, 2025 at 12:28:41PM +0200, Jouni Högander wrote:
> > Do needed changes to handle PSR2_MAN_TRK_CTL correctly when DSB is
> > in use:
> > 
> > 1. Write PSR2_MAN_TRK_CTL in commit_pipe_pre_planes only when not
> > using
> >    DSB.
> > 2. Add PSR2_MAN_TRK_CTL writing into DSB commit in
> >    intel_atomic_dsb_finish.
> > 
> > Taking PSR lock over DSB commit is not needed because
> > PSR2_MAN_TRK_CTL is
> > now written only by DSB.
> > 
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> > Reviewed-by: Animesh Manna <animesh.manna at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_display.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index aed35f203fd8d..5db2af86d0c8a 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -7143,7 +7143,8 @@ static void commit_pipe_pre_planes(struct
> > intel_atomic_state *state,
> >  			intel_pipe_fastset(old_crtc_state,
> > new_crtc_state);
> >  	}
> >  
> > -	intel_psr2_program_trans_man_trk_ctl(NULL,
> > new_crtc_state);
> > +	if (!new_crtc_state->use_dsb)
> > +		intel_psr2_program_trans_man_trk_ctl(NULL,
> > new_crtc_state);
> 
> commit_pipe_pre_planes() is not called when use_dsb==true.

Couple of lines earlier in same function there is this:

	if (!modeset && !new_crtc_state->use_dsb) {

I followed that in here. Do you still think I should remove checking
use_dsb from my patch?

BR,

Jouni Högander
> 
> >  
> >  	intel_atomic_update_watermarks(state, crtc);
> >  }
> > @@ -7731,6 +7732,8 @@ static void intel_atomic_dsb_finish(struct
> > intel_atomic_state *state,
> >  					       new_crtc_state);
> >  		bdw_set_pipe_misc(new_crtc_state->dsb_commit,
> >  				  new_crtc_state);
> > +		intel_psr2_program_trans_man_trk_ctl(new_crtc_stat
> > e->dsb_commit,
> > +						    
> > new_crtc_state);
> >  		intel_crtc_planes_update_arm(new_crtc_state-
> > >dsb_commit,
> >  					     state, crtc);
> >  
> > -- 
> > 2.43.0
>