github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe/rtp: Maintain OA whitelists separately

Browse Source 
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: 828a8eaf37 ("drm/xe/oa: Add MMIO trigger support")
Cc: stable@vger.kernel.org # v6.12+
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Link: https://patch.msgid.link/20260615224227.34880-3-ashutosh.dixit@intel.com
(cherry picked from commit c478244a9e2d14b3f1f92e8bd293919e554622a5)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
This commit is contained in:
Ashutosh Dixit 2026-06-15 15:42:20 -07:00 committed by Thomas Hellström
parent 61596826b8
commit 31e2437561
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/xe/xe_gt_debugfs.c
View File

@ -149,8 +149,10 @@ static int register_save_restore(struct xe_gt *gt, struct 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;
}

2
drivers/gpu/drm/xe/xe_hw_engine.c
View File

@ -572,6 +572,8 @@ static void hw_engine_init_early(struct xe_gt *gt, struct 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);
}

8
drivers/gpu/drm/xe/xe_hw_engine_types.h
View File

@ -130,6 +130,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/close
*/
struct xe_reg_sr oa_sr;
/**
* @reg_lrc: LRC workaround registers
*/

5
drivers/gpu/drm/xe/xe_reg_whitelist.c
View File

@ -103,6 +103,9 @@ static const struct xe_rtp_table_sr register_whitelist = XE_RTP_TABLE_SR(
WHITELIST(VFLSKPD,
RING_FORCE_TO_NONPRIV_ACCESS_RW))
},
);
static const struct xe_rtp_table_sr oa_whitelist = XE_RTP_TABLE_SR(
#define WHITELIST_DENY(r, f) WHITELIST(r, (f) | RING_FORCE_TO_NONPRIV_DENY)
@ -206,6 +209,8 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)
xe_rtp_process_to_sr(&ctx, &register_whitelist, &hwe->reg_whitelist, false);
whitelist_apply_to_hwe(hwe);
xe_rtp_process_to_sr(&ctx, &oa_whitelist, &hwe->oa_whitelist, false);
}
/**