Re: [PATCH 2/2] drm/xe: Avoid touching consumer fields in GuC pagefault ack

[Francois Dugast <francois.dugast@intel.com>]

On Thu, Feb 12, 2026 at 12:42:27PM -0800, Matthew Brost wrote:
> The GuC pagefault acknowledgement code is designed to extract the fields
> needed for the acknowledgement from the producer-stored message so that
> the consumer fields can be overloaded to return additional information.
> The ASID is stored in the producer message; extract it from there to
> future‑proof this logic.
> 
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>

Reviewed-by: Francois Dugast <francois.dugast@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_guc_pagefault.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_pagefault.c b/drivers/gpu/drm/xe/xe_guc_pagefault.c
> index 1166b0a5fa21..d48f6ed103bb 100644
> --- a/drivers/gpu/drm/xe/xe_guc_pagefault.c
> +++ b/drivers/gpu/drm/xe/xe_guc_pagefault.c
> @@ -17,6 +17,7 @@ static void guc_ack_fault(struct xe_pagefault *pf, int err)
>  	u32 pdata = FIELD_GET(PFD_PDATA_LO, pf->producer.msg[0]) |
>  		(FIELD_GET(PFD_PDATA_HI, pf->producer.msg[1]) <<
>  		 PFD_PDATA_HI_SHIFT);
> +	u32 asid = FIELD_GET(PFD_ASID, pf->producer.msg[1]);
>  	u32 action[] = {
>  		XE_GUC_ACTION_PAGE_FAULT_RES_DESC,
>  
> @@ -24,7 +25,7 @@ static void guc_ack_fault(struct xe_pagefault *pf, int err)
>  		FIELD_PREP(PFR_SUCCESS, !!err) |
>  		FIELD_PREP(PFR_REPLY, PFR_ACCESS) |
>  		FIELD_PREP(PFR_DESC_TYPE, FAULT_RESPONSE_DESC) |
> -		FIELD_PREP(PFR_ASID, pf->consumer.asid),
> +		FIELD_PREP(PFR_ASID, asid),
>  
>  		FIELD_PREP(PFR_VFID, vfid) |
>  		FIELD_PREP(PFR_ENG_INSTANCE, engine_instance) |
> -- 
> 2.34.1
>