Re: [PATCH 7.1.y] drm/xe/rtp: Maintain OA whitelists separately

On Fri, 31 Jul 2026 17:45:26 -0700, Sasha Levin wrote:
>

Hi Sasha/Greg,

The patch below is correct. However, because you will encounter conflicts
in other patches of this series too, I have backported the entire series
for linux-7.1.y here:

https://lore.kernel.org/stable/20260803230136.3270230-1-ashutosh.dixit@inte=
l.com/

Will it be possible to apply the patches from the above link instead?
Since it will save us some work.

I will also send backports of this series to linux-6.12.y and linux-6.18.y.

Sorry, I am not too sure of the process to follow here. So if it needs to
be done differently please let me know.

Thanks.
--
Ashutosh

> From: Ashutosh Dixit <[email protected]>
>
> [ Upstream commit 31e2437561621b4867c08efc890bf629d017df03 ]
>
> OA registers are dynamically whitelisted (and again dewhitelisted) on OA
> stream open/close. Maintaining OA whitelists separately from non-OA
> register whitlists simplifies this management of OA register
> whitelisting/dewhitelisting.
>
> Fixes: 828a8eaf37c3 ("drm/xe/oa: Add MMIO trigger support")
> Cc: [email protected] # v6.12+
> Signed-off-by: Ashutosh Dixit <[email protected]>
> Reviewed-by: Umesh Nerlige Ramappa <[email protected]>
> Link: https://patch.msgid.link/20260615224227.34880-3-ashutosh.dixit@inte=
l.com
> (cherry picked from commit c478244a9e2d14b3f1f92e8bd293919e554622a5)
> Signed-off-by: Thomas Hellstr=F6m <[email protected]>
> [ adapted RTP table from struct wrapper macro `XE_RTP_TABLE_SR()` back to=
 plain `struct xe_rtp_entry_sr[]` array and restored the 5-arg `xe_rtp_proc=
ess_to_sr()` call with `ARRAY_SIZE()` ]
> Signed-off-by: Sasha Levin <[email protected]>
> ---
>  drivers/gpu/drm/xe/xe_gt_debugfs.c      | 4 +++-
>  drivers/gpu/drm/xe/xe_hw_engine.c       | 2 ++
>  drivers/gpu/drm/xe/xe_hw_engine_types.h | 8 ++++++++
>  drivers/gpu/drm/xe/xe_reg_whitelist.c   | 6 ++++++
>  4 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_g=
t_debugfs.c
> index f45306308cd6..c38bcacb27e4 100644
> --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> @@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, s=
truct drm_printer *p)
>	drm_printf(p, "\n");
>
>	drm_printf(p, "Whitelist\n");
> -	for_each_hw_engine(hwe, gt, id)
> +	for_each_hw_engine(hwe, gt, id) {
>		xe_reg_whitelist_dump(&hwe->reg_whitelist, p);
> +		xe_reg_whitelist_dump(&hwe->oa_whitelist, p);
> +	}
>
>	return 0;
>  }
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw=
_engine.c
> index a7441a66e94c..b5a869c720af 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
> @@ -575,6 +575,8 @@ static void hw_engine_init_early(struct xe_gt *gt, st=
ruct xe_hw_engine *hwe,
>	hw_engine_setup_default_state(hwe);
>
>	xe_reg_sr_init(&hwe->reg_whitelist, hwe->name, gt_to_xe(gt));
> +	xe_reg_sr_init(&hwe->oa_whitelist, hwe->name, gt_to_xe(gt));
> +	xe_reg_sr_init(&hwe->oa_sr, hwe->name, gt_to_xe(gt));
>	xe_reg_whitelist_process_engine(hwe);
>  }
>
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine_types.h b/drivers/gpu/drm/xe=
/xe_hw_engine_types.h
> index e4191a7a2c31..04ca7545d22c 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine_types.h
> +++ b/drivers/gpu/drm/xe/xe_hw_engine_types.h
> @@ -128,6 +128,14 @@ struct xe_hw_engine {
>	 * @reg_whitelist: table with registers to be whitelisted
>	 */
>	struct xe_reg_sr reg_whitelist;
> +	/**
> +	 * @oa_whitelist: oa registers to be whitelisted
> +	 */
> +	struct xe_reg_sr oa_whitelist;
> +	/**
> +	 * @oa_sr: oa nonpriv whitelist registers, changed on oa stream open/cl=
ose
> +	 */
> +	struct xe_reg_sr oa_sr;
>	/**
>	 * @reg_lrc: LRC workaround registers
>	 */
> diff --git a/drivers/gpu/drm/xe/xe_reg_whitelist.c b/drivers/gpu/drm/xe/x=
e_reg_whitelist.c
> index 8cc313182968..089335b185d1 100644
> --- a/drivers/gpu/drm/xe/xe_reg_whitelist.c
> +++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c
> @@ -89,6 +89,9 @@ static const struct xe_rtp_entry_sr register_whitelist[=
] =3D {
>			 WHITELIST(VFLSKPD,
>				   RING_FORCE_TO_NONPRIV_ACCESS_RW))
>	},
> +};
> +
> +static const struct xe_rtp_entry_sr oa_whitelist[] =3D {
>
>  #define WHITELIST_OA_MMIO_TRG(trg, status, head) \
>	WHITELIST(trg, RING_FORCE_TO_NONPRIV_ACCESS_RW), \
> @@ -191,6 +194,9 @@ void xe_reg_whitelist_process_engine(struct xe_hw_eng=
ine *hwe)
>	xe_rtp_process_to_sr(&ctx, register_whitelist, ARRAY_SIZE(register_whitel=
ist),
>			     &hwe->reg_whitelist, false);
>	whitelist_apply_to_hwe(hwe);
> +
> +	xe_rtp_process_to_sr(&ctx, oa_whitelist, ARRAY_SIZE(oa_whitelist),
> +			     &hwe->oa_whitelist, false);
>  }
>
>  /**
> --
> 2.53.0
>