[Intel-xe] [PATCH 10/17] drm/xe: Remove XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE from uAPI

[Francois Dugast]

On Sat, Oct 07, 2023 at 08:20:39AM +0000, Zhang, Carl wrote:
> Hi Rodrigo,
> Is there detail descriptions for these properties?
> 
> Thanks
> Carl

Hi Carl,

I think there is not but this is a good idea for uAPI take 2.

In the meantime, when using those properties leads to setting
a value in exec queue, it can be helpful to check the comments
in the matching member of struct xe_exec_queue [1], for example
XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER and acc_trigger.

[1] https://gitlab.freedesktop.org/drm/xe/kernel/-/blob/drm-xe-next/drivers/gpu/drm/xe/xe_exec_queue_types.h#L29-162

Francois

> 
> > -----Original Message-----
> > From: Vivi, Rodrigo <rodrigo.vivi at intel.com>
> > Sent: Tuesday, September 19, 2023 10:25 PM
> > To: intel-xe at lists.freedesktop.org
> > Cc: Hazubski, Filip <filip.hazubski at intel.com>; Kopryk, Kamil
> > <kamil.kopryk at intel.com>; Chaberek, Jakub <jakub.chaberek at intel.com>;
> > Dunajski, Bartosz <bartosz.dunajski at intel.com>; Souza, Jose
> > <jose.souza at intel.com>; Yu, Effie <effie.yu at intel.com>; Zhang, Carl
> > <carl.zhang at intel.com>; Brost, Matthew <matthew.brost at intel.com>;
> > Vishwanathapura, Niranjana <niranjana.vishwanathapura at intel.com>; Vivi,
> > Rodrigo <rodrigo.vivi at intel.com>
> > Subject: [PATCH 10/17] drm/xe: Remove
> > XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE from uAPI
> > 
> > From: Matthew Brost <matthew.brost at intel.com>
> > 
> > Functionality of XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE
> > deprecated in a previous patch, drop from uAPI. The property is just simply
> > inherented from the VM.
> > 
> > v2:
> >  - Update commit message (Niranjana)
> > 
> > Reviewed-by: Niranjana Vishwanathapura
> > <niranjana.vishwanathapura at intel.com>
> > Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_exec_queue.c |  7 -------
> >  include/uapi/drm/xe_drm.h          | 19 ++++++-------------
> >  2 files changed, 6 insertions(+), 20 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c
> > b/drivers/gpu/drm/xe/xe_exec_queue.c
> > index 170d9d9c48d2..f70332986c73 100644
> > --- a/drivers/gpu/drm/xe/xe_exec_queue.c
> > +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
> > @@ -320,12 +320,6 @@ static int exec_queue_set_preemption_timeout(struct
> > xe_device *xe,
> >  	return q->ops->set_preempt_timeout(q, value);  }
> > 
> > -static int exec_queue_set_compute_mode(struct xe_device *xe, struct
> > xe_exec_queue *q,
> > -				       u64 value, bool create)
> > -{
> > -	return 0;
> > -}
> > -
> >  static int exec_queue_set_persistence(struct xe_device *xe, struct
> > xe_exec_queue *q,
> >  				      u64 value, bool create)
> >  {
> > @@ -411,7 +405,6 @@ static const xe_exec_queue_set_property_fn
> > exec_queue_set_property_funcs[] = {
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY] =
> > exec_queue_set_priority,
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE] =
> > exec_queue_set_timeslice,
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT] =
> > exec_queue_set_preemption_timeout,
> > -	[XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE] =
> > exec_queue_set_compute_mode,
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE] =
> > exec_queue_set_persistence,
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT] =
> > exec_queue_set_job_timeout,
> >  	[XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER] =
> > exec_queue_set_acc_trigger, diff --git a/include/uapi/drm/xe_drm.h
> > b/include/uapi/drm/xe_drm.h index e39d66a65c89..fb7c3a8ac572 100644
> > --- a/include/uapi/drm/xe_drm.h
> > +++ b/include/uapi/drm/xe_drm.h
> > @@ -784,21 +784,14 @@ struct drm_xe_exec_queue_set_property {
> >  	/** @exec_queue_id: Exec queue ID */
> >  	__u32 exec_queue_id;
> > 
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY			0
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY		0
> >  #define XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE		1
> >  #define XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT	2
> > -	/*
> > -	 * Long running or ULLS engine mode. DMA fences not allowed in this
> > -	 * mode. Must match the value of
> > DRM_XE_VM_CREATE_COMPUTE_MODE, serves
> > -	 * as a sanity check the UMD knows what it is doing. Can only be set at
> > -	 * engine create time.
> > -	 */
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE		3
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE		4
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT		5
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER		6
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY		7
> > -#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY		8
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE		3
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT		4
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER		5
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY		6
> > +#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY	7
> >  	/** @property: property to set */
> >  	__u32 property;
> > 
> > --
> > 2.41.0
>