[PATCH v2] drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change

[Matthew Brost]

On Thu, Mar 27, 2025 at 02:02:05PM -0700, Matt Roper wrote:
> On Thu, Mar 27, 2025 at 11:56:04AM -0700, Niranjana Vishwanathapura wrote:
> > The RCU_MODE_FIXED_SLICE_CCS_MODE setting is not getting invoked
> > in the gt reset path after the ccs_mode setting by the user.
> > Add it to engine register update list (in hw_engine_setup_default_state())
> > which ensures it gets set in the gt reset and engine reset paths.
> > 
> > v2: Add register update to engine list to ensure it gets updated
> > after engine reset also.
> > 
> > Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura at intel.com>
> 
> Reviewed-by: Matt Roper <matthew.d.roper at intel.com>
> 

Merged this to drm-xe-next at the request of Saurabhg. I added a fixes
tag so this gets backported.

Matt

> > ---
> >  drivers/gpu/drm/xe/xe_hw_engine.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
> > index 8c05fd30b7df..93241fd0a4ba 100644
> > --- a/drivers/gpu/drm/xe/xe_hw_engine.c
> > +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
> > @@ -389,12 +389,6 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe)
> >  				 blit_cctl_val,
> >  				 XE_RTP_ACTION_FLAG(ENGINE_BASE)))
> >  		},
> > -		/* Use Fixed slice CCS mode */
> > -		{ XE_RTP_NAME("RCU_MODE_FIXED_SLICE_CCS_MODE"),
> > -		  XE_RTP_RULES(FUNC(xe_hw_engine_match_fixed_cslice_mode)),
> > -		  XE_RTP_ACTIONS(FIELD_SET(RCU_MODE, RCU_MODE_FIXED_SLICE_CCS_MODE,
> > -					   RCU_MODE_FIXED_SLICE_CCS_MODE))
> > -		},
> >  		/* Disable WMTP if HW doesn't support it */
> >  		{ XE_RTP_NAME("DISABLE_WMTP_ON_UNSUPPORTED_HW"),
> >  		  XE_RTP_RULES(FUNC(xe_rtp_cfeg_wmtp_disabled)),
> > @@ -461,6 +455,12 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe)
> >  		  XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0), CS_PRIORITY_MEM_READ,
> >  				     XE_RTP_ACTION_FLAG(ENGINE_BASE)))
> >  		},
> > +		/* Use Fixed slice CCS mode */
> > +		{ XE_RTP_NAME("RCU_MODE_FIXED_SLICE_CCS_MODE"),
> > +		  XE_RTP_RULES(FUNC(xe_hw_engine_match_fixed_cslice_mode)),
> > +		  XE_RTP_ACTIONS(FIELD_SET(RCU_MODE, RCU_MODE_FIXED_SLICE_CCS_MODE,
> > +					   RCU_MODE_FIXED_SLICE_CCS_MODE))
> > +		},
> >  	};
> >  
> >  	xe_rtp_process_to_sr(&ctx, engine_entries, ARRAY_SIZE(engine_entries), &hwe->reg_sr);
> > -- 
> > 2.43.0
> > 
> 
> -- 
> Matt Roper
> Graphics Software Engineer
> Linux GPU Platform Enablement
> Intel Corporation