Re: [PATCH v3 4/5] drm/xe: Rename EXEC_MODE_LR to EXEC_MODE_FAULT in hw engine group

["Thomas Hellström" <thomas.hellstrom@linux.intel.com>]

On Thu, 2026-05-28 at 19:33 +0200, Francois Dugast wrote:
> On Thu, May 28, 2026 at 01:06:38PM -0400, Rodrigo Vivi wrote:
> > On Mon, May 25, 2026 at 03:30:50PM +0200, Thomas Hellström wrote:
> > > The execution mode tracked by xe_hw_engine_group_execution_mode
> > > describes whether the hw engine group is currently executing jobs
> > > in fault mode (long-running, fault-capable) or in DMA fence mode.
> > > The EXEC_MODE_LR label was misleading since not all LR queues use
> > > fault mode; rename it to EXEC_MODE_FAULT for clarity.
> > > 
> > > No functional change.
> > > 
> > > Assisted-by: GitHub_Copilot:claude-sonnet-4.6
> > > Signed-off-by: Thomas Hellström
> > > <thomas.hellstrom@linux.intel.com>
> > > ---
> > >  drivers/gpu/drm/xe/xe_exec.c                  |  2 +-
> > >  drivers/gpu/drm/xe/xe_hw_engine_group.c       | 10 +++++-----
> > >  drivers/gpu/drm/xe/xe_hw_engine_group_types.h |  4 ++--
> > >  3 files changed, 8 insertions(+), 8 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/xe/xe_exec.c
> > > b/drivers/gpu/drm/xe/xe_exec.c
> > > index e05dabfcd43c..15ad0fee906c 100644
> > > --- a/drivers/gpu/drm/xe/xe_exec.c
> > > +++ b/drivers/gpu/drm/xe/xe_exec.c
> > > @@ -342,7 +342,7 @@ int xe_exec_ioctl(struct drm_device *dev,
> > > void *data, struct drm_file *file)
> > >  		spin_unlock(&xe->ttm.lru_lock);
> > >  	}
> > >  
> > > -	if (mode == EXEC_MODE_LR)
> > > +	if (mode == EXEC_MODE_FAULT)
> > >  		xe_hw_engine_group_resume_faulting_lr_jobs(group
> > > );
> > >  
> > >  err_repin:
> > > diff --git a/drivers/gpu/drm/xe/xe_hw_engine_group.c
> > > b/drivers/gpu/drm/xe/xe_hw_engine_group.c
> > > index 791be6edd0a4..fba0ed039bad 100644
> > > --- a/drivers/gpu/drm/xe/xe_hw_engine_group.c
> > > +++ b/drivers/gpu/drm/xe/xe_hw_engine_group.c
> > > @@ -22,12 +22,12 @@ hw_engine_group_resume_lr_jobs_func(struct
> > > work_struct *w)
> > >  	int err;
> > >  	enum xe_hw_engine_group_execution_mode previous_mode;
> > >  
> > > -	err = xe_hw_engine_group_get_mode(group, EXEC_MODE_LR,
> > > &previous_mode,
> > > +	err = xe_hw_engine_group_get_mode(group,
> > > EXEC_MODE_FAULT, &previous_mode,
> > >  					  NULL, 0);
> > >  	if (err)
> > >  		return;
> > >  
> > > -	if (previous_mode == EXEC_MODE_LR)
> > > +	if (previous_mode == EXEC_MODE_FAULT)
> > >  		goto put;
> > >  
> > >  	list_for_each_entry(q, &group->exec_queue_list,
> > > hw_engine_group_link) {
> > > @@ -292,13 +292,13 @@ static int switch_mode(struct
> > > xe_hw_engine_group *group, bool has_deps)
> > >  	lockdep_assert_held_write(&group->mode_sem);
> > >  
> > >  	switch (group->cur_mode) {
> > > -	case EXEC_MODE_LR:
> > > +	case EXEC_MODE_FAULT:
> > >  		new_mode = EXEC_MODE_DMA_FENCE;
> > >  		err =
> > > xe_hw_engine_group_suspend_faulting_lr_jobs(group,
> > >  								 
> > >  has_deps);
> > 
> > should we also rename this function?
> 
> I think we should, together with other occurrences of "lr" in this
> file.

I think this particular instance is correct by including "faulting",
anyway, I'll rename it to "..fault_mode_jobs" and also do an additional
check of other "lr" only instances.

Thanks,
Thomas



> 
> Francois
> 
> > 
> > 
> > anyway, for this patch:
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > 
> > >  		break;
> > >  	case EXEC_MODE_DMA_FENCE:
> > > -		new_mode = EXEC_MODE_LR;
> > > +		new_mode = EXEC_MODE_FAULT;
> > >  		err =
> > > xe_hw_engine_group_wait_for_dma_fence_jobs(group);
> > >  		break;
> > >  	}
> > > @@ -395,7 +395,7 @@ enum xe_hw_engine_group_execution_mode
> > >  xe_hw_engine_group_find_exec_mode(struct xe_exec_queue *q)
> > >  {
> > >  	if (xe_vm_in_fault_mode(q->vm))
> > > -		return EXEC_MODE_LR;
> > > +		return EXEC_MODE_FAULT;
> > >  	else
> > >  		return EXEC_MODE_DMA_FENCE;
> > >  }
> > > diff --git a/drivers/gpu/drm/xe/xe_hw_engine_group_types.h
> > > b/drivers/gpu/drm/xe/xe_hw_engine_group_types.h
> > > index 92b6e0712c03..b4c41de6ba5f 100644
> > > --- a/drivers/gpu/drm/xe/xe_hw_engine_group_types.h
> > > +++ b/drivers/gpu/drm/xe/xe_hw_engine_group_types.h
> > > @@ -14,11 +14,11 @@
> > >   * enum xe_hw_engine_group_execution_mode - possible execution
> > > modes of a hw
> > >   * engine group
> > >   *
> > > - * @EXEC_MODE_LR: execution in long-running mode
> > > + * @EXEC_MODE_FAULT: execution in fault mode (long-running,
> > > fault-capable)
> > >   * @EXEC_MODE_DMA_FENCE: execution in dma fence mode
> > >   */
> > >  enum xe_hw_engine_group_execution_mode {
> > > -	EXEC_MODE_LR,
> > > +	EXEC_MODE_FAULT,
> > >  	EXEC_MODE_DMA_FENCE,
> > >  };
> > >  
> > > -- 
> > > 2.54.0
> > >