[PATCH v2 5/5] drm/xe: Replace engine references with exec queue in xe_guc_submit.c

[Ghimiray, Himal Prasad]

> -----Original Message-----
> From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of
> Matthew Brost
> Sent: 25 April 2024 11:25
> To: intel-xe at lists.freedesktop.org
> Cc: Brost, Matthew <matthew.brost at intel.com>
> Subject: [PATCH v2 5/5] drm/xe: Replace engine references with exec queue
> in xe_guc_submit.c
> 
> Exec queue has replaced engine nomenclature.
> 
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc_submit.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c
> b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 28c1b9b46251..5aa6ad540ef5 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -426,9 +426,9 @@ static void set_min_preemption_timeout(struct
> xe_guc *guc, struct xe_exec_queue
>  	xe_map_wr_field(xe_, &map_, 0, struct guc_submit_parallel_scratch,
> \
>  			field_, val_)
> 
> -static void __register_mlrc_engine(struct xe_guc *guc,
> -				   struct xe_exec_queue *q,
> -				   struct guc_ctxt_registration_info *info)
> +static void __register_mlrc_exec_queue(struct xe_guc *guc,
> +				       struct xe_exec_queue *q,
> +				       struct guc_ctxt_registration_info *info)
>  {
>  #define MAX_MLRC_REG_SIZE      (13 + XE_HW_ENGINE_MAX_INSTANCE * 2)
>  	struct xe_device *xe = guc_to_xe(guc); @@ -465,8 +465,8 @@ static
> void __register_mlrc_engine(struct xe_guc *guc,
>  	xe_guc_ct_send(&guc->ct, action, len, 0, 0);  }
> 
> -static void __register_engine(struct xe_guc *guc,
> -			      struct guc_ctxt_registration_info *info)
> +static void __register_exec_queue(struct xe_guc *guc,
> +				  struct guc_ctxt_registration_info *info)
>  {
>  	u32 action[] = {
>  		XE_GUC_ACTION_REGISTER_CONTEXT,
> @@ -486,7 +486,7 @@ static void __register_engine(struct xe_guc *guc,
>  	xe_guc_ct_send(&guc->ct, action, ARRAY_SIZE(action), 0, 0);  }
> 
> -static void register_engine(struct xe_exec_queue *q)
> +static void register_exec_queue(struct xe_exec_queue *q)
>  {
>  	struct xe_guc *guc = exec_queue_to_guc(q);
>  	struct xe_device *xe = guc_to_xe(guc); @@ -534,9 +534,9 @@ static
> void register_engine(struct xe_exec_queue *q)
>  	set_exec_queue_registered(q);
>  	trace_xe_exec_queue_register(q);
>  	if (xe_exec_queue_is_parallel(q))
> -		__register_mlrc_engine(guc, q, &info);
> +		__register_mlrc_exec_queue(guc, q, &info);
>  	else
> -		__register_engine(guc, &info);
> +		__register_exec_queue(guc, &info);
>  	init_policies(guc, q);
>  }
> 
> @@ -706,7 +706,7 @@ guc_exec_queue_run_job(struct drm_sched_job
> *drm_job)
> 
>  	if (!exec_queue_killed_or_banned(q) &&
> !xe_sched_job_is_error(job)) {
>  		if (!exec_queue_registered(q))
> -			register_engine(q);
> +			register_exec_queue(q);

LGTM
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>

>  		if (!lr)	/* LR jobs are emitted in the exec IOCTL */
>  			q->ring_ops->emit_job(job);
>  		submit_exec_queue(q);
> --
> 2.34.1