Re: [PATCH 2/5] drm/xe/guc: Use proper flag definitions when registering context

[Matthew Brost <matthew.brost@intel.com>]

On Thu, Sep 04, 2025 at 09:29:14PM +0200, Michal Wajdeczko wrote:
> In H2G action context type is specified in flags dword in bits 2:1.
> Use generic FIELD_PREP macro instead of misleading BIT logic.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_guc_fwif.h   | 1 +
>  drivers/gpu/drm/xe/xe_guc_submit.c | 6 ++----
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_fwif.h b/drivers/gpu/drm/xe/xe_guc_fwif.h
> index 0508f1064178..561e15e86d58 100644
> --- a/drivers/gpu/drm/xe/xe_guc_fwif.h
> +++ b/drivers/gpu/drm/xe/xe_guc_fwif.h
> @@ -65,6 +65,7 @@ struct guc_ctxt_registration_info {
>  	u32 hwlrca_hi;
>  };
>  #define CONTEXT_REGISTRATION_FLAG_KMD	BIT(0)
> +#define CONTEXT_REGISTRATION_FLAG_TYPE	GENMASK(2, 1)
>  
>  /* 32-bit KLV structure as used by policy updates and others */
>  struct guc_klv_generic_dw_t {
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index f2920b047b2c..3437206c4a55 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -558,10 +558,8 @@ static void register_exec_queue(struct xe_exec_queue *q, int ctx_type)
>  	info.engine_submit_mask = q->logical_mask;
>  	info.hwlrca_lo = lower_32_bits(xe_lrc_descriptor(lrc));
>  	info.hwlrca_hi = upper_32_bits(xe_lrc_descriptor(lrc));
> -	info.flags = CONTEXT_REGISTRATION_FLAG_KMD;
> -
> -	if (ctx_type != GUC_CONTEXT_NORMAL)
> -		info.flags |= BIT(ctx_type);
> +	info.flags = CONTEXT_REGISTRATION_FLAG_KMD |
> +		FIELD_PREP(CONTEXT_REGISTRATION_FLAG_TYPE, ctx_type);
>  
>  	if (xe_exec_queue_is_parallel(q)) {
>  		u64 ggtt_addr = xe_lrc_parallel_ggtt_addr(lrc);
> -- 
> 2.47.1
>