drm/xe: use entry_dump callbacks for xe2+ PAT dumps
Subsystems (2)
PATCH 1/1 drm/xe: use entry_dump callbacks for xe2+ PAT dumps
Move xe2+ PAT entry printing into the entry_dump op so platform specific logic stays localized, simplifying future maintenance.
--- drivers/gpu/drm/xe/xe_pat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/xe/xe_pat.c +11 -7
@@ -88,6 +88,8 @@ struct xe_pat_ops {void (*program_media)(struct xe_gt *gt,const struct xe_pat_table_entry table[],int n_entries);int (*dump)(struct xe_gt *gt,struct drm_printer *p); +void (*entry_dump)(struct drm_printer *p,const char *label,u32 pat,bool rsvd); + };static const struct xe_pat_table_entry xelp_pat_table[] = {
@@ -480,6 +482,7 @@ static const struct xe_pat_ops xe2_pat_ops = { .program_graphics = program_pat_mcr, .program_media = program_pat, .dump = xe2_dump, + .entry_dump = xe2_pat_entry_dump, };static int xe3p_xpc_dump (struct xe_gt *gt,struct drm_printer *p)
@@ -518,6 +521,7 @@ static const struct xe_pat_ops xe3p_xpc_pat_ops = { .program_graphics = program_pat_mcr, .program_media = program_pat, .dump = xe3p_xpc_dump, + .entry_dump = xe3p_xpc_pat_entry_dump, };void xe_pat_init_early (struct xe_device *xe)
@@ -607,6 +611,9 @@ void xe_pat_init_early(struct xe_device *xe)xe_assert (xe, !xe->pat.ops || xe->pat.ops->dump);xe_assert (xe, !xe->pat.ops || xe->pat.ops->program_graphics);xe_assert (xe, !xe->pat.ops ||MEDIA_VER (xe) <13 || xe->pat.ops->program_media); +if (GRAPHICS_VER (xe) >=20 ) { +xe_assert (xe, !xe->pat.ops || xe->pat.ops->entry_dump); + } }void xe_pat_init (struct xe_gt *gt)
@@ -658,12 +665,9 @@ int xe_pat_dump_sw_config(struct xe_gt *gt, struct drm_printer *p)for (u32 i =0 ; i < xe->pat.n_entries; i++) {u32 pat = xe->pat.table[i].value; -if (GRAPHICS_VERx100 (xe) ==3511 ) { -xe_pat_index_label (label,sizeof (label), i); -xe3p_xpc_pat_entry_dump (p, label, pat, !xe->pat.table[i].valid); - }else if (GRAPHICS_VER (xe) ==30 ||GRAPHICS_VER (xe) ==20 ) { +if (GRAPHICS_VERx100 (xe) >=20 ) {xe_pat_index_label (label,sizeof (label), i); -xe2_pat_entry_dump (p, label, pat, !xe->pat.table[i].valid); + xe->pat.ops->entry_dump (p, label, pat, !xe->pat.table[i].valid); }else if (xe->info.platform ==XE_METEORLAKE ) {xelpg_pat_entry_dump (p, i, pat); }else if (xe->info.platform ==XE_PVC ) {
@@ -679,14 +683,14 @@ int xe_pat_dump_sw_config(struct xe_gt *gt, struct drm_printer *p)u32 pat = xe->pat.pat_pta->value;drm_printf (p,"Page Table Access:\n" ); -xe2_pat_entry_dump (p,"PTA_MODE" , pat, false); + xe->pat.ops->entry_dump (p,"PTA_MODE" , pat, false); }if (xe->pat.pat_ats) {u32 pat = xe->pat.pat_ats->value;drm_printf (p,"PCIe ATS/PASID:\n" ); -xe2_pat_entry_dump (p,"PAT_ATS " , pat, false); + xe->pat.ops->entry_dump (p,"PAT_ATS " , pat, false); }drm_printf (p,"Cache Level:\n" );
Signature · 1 line
2.43.0
This is not work for the SRIOV case. Will submit a new version.
Quoted 99 lines
-----Original Message-----
From: Wang, X <[email protected]>
Sent: Thursday, January 29, 2026 15:28
To: [email protected]
Cc: Wang, X <[email protected]>; Roper, Matthew D <[email protected]>; Nguyen, Brian3 <[email protected]>
Subject: [PATCH] drm/xe: useentry_dumpcallbacks for xe2+ PAT dumpsMove xe2+ PAT entry printing into the
entry_dumpop so platform specific logic stays localized, simplifying future maintenance.Cc Matt Roper <[email protected]>Suggested-by Brian Nguyen <[email protected]>Signed-off-by Xin Wang <[email protected]>--- drivers/gpu/drm/xe/xe_pat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/gpu/drm/xe/xe_pat.c index renamed from drivers/gpu/drm/xe/xe_pat.c +0
-0
14d0dce5190a..c33620478c99100644drivers/gpu/drm/xe/xe_pat.c +3
-0@@ -88,6 +88,8 @@ struct xe_pat_ops {void (*program_media)(struct xe_gt *gt,const struct xe_pat_table_entry table[],int n_entries);int (*dump)(struct xe_gt *gt,struct drm_printer *p); +void (*entry_dump)(struct drm_printer *p,const char *label,u32 pat, +bool rsvd); + }; static const struct xe_pat_table_entry xelp_pat_table[] = { @@ -480,6 +482,7@@ static const struct
xe_pat_opsxe2_pat_ops= {drivers/gpu/drm/xe/xe_pat.c +3
-0.program_graphics = program_pat_mcr, .program_media = program_pat, .dump = xe2_dump, + .entry_dump = xe2_pat_entry_dump, }; static int xe3p_xpc_dump(struct xe_gt *gt, struct drm_printer *p) @@ -518,6 +521,7 @@ static const struct xe_pat_ops xe3p_xpc_pat_ops = { .program_graphics = program_pat_mcr, .program_media = program_pat, .dump = xe3p_xpc_dump, + .entry_dump = xe3p_xpc_pat_entry_dump, }; void xe_pat_init_early(struct xe_device *xe) @@ -607,6 +611,9 @@ void
xe_pat_init_early(struct xe_device *xe)drivers/gpu/drm/xe/xe_pat.c +0
-0xe_assert (xe, !xe->pat.ops || xe->pat.ops->dump);xe_assert (xe, !xe->pat.ops || xe->pat.ops->program_graphics); xe_assert(xe, !xe->pat.ops || MEDIA_VER(xe) < 13 || xe->pat.ops-Quoted 1 line
program_media);drivers/gpu/drm/xe/xe_pat.c +4
-5+if (GRAPHICS_VER (xe) >=20 ) { +xe_assert (xe, !xe->pat.ops || xe->pat.ops->entry_dump); + } }void xe_pat_init (struct xe_gt *gt)@@ -658,12 +665,9 @@ int xe_pat_dump_sw_config(struct xe_gt *gt, struct drm_printer *p)for (u32 i =0 ; i < xe->pat.n_entries; i++) {u32 pat = xe->pat.table[i].value; -if (GRAPHICS_VERx100 (xe) ==3511 ) { -xe_pat_index_label (label,sizeof (label), i); -xe3p_xpc_pat_entry_dump (p, label, pat, !xe- >pat.table[i].valid); - }else if (GRAPHICS_VER (xe) ==30 ||GRAPHICS_VER (xe) == 20) { +if (GRAPHICS_VERx100 (xe) >=20 ) {xe_pat_index_label (label,sizeof (label), i); - xe2_pat_entry_dump(p, label, pat, !xe-Quoted 1 line
pat.table[i].valid);
drivers/gpu/drm/xe/xe_pat.c +1
-0+ xe->pat.ops->entry_dump(p, label, pat, !xe-Quoted 1 line
pat.table[i].valid);
drivers/gpu/drm/xe/xe_pat.c +0
-0}else if (xe->info.platform ==XE_METEORLAKE ) {xelpg_pat_entry_dump (p, i, pat); } else if (xe->info.platform == XE_PVC) { @@ -679,14 +683,14@@ int
xe_pat_dump_sw_config(struct xe_gt *gt, struct drm_printer *p)drivers/gpu/drm/xe/xe_pat.c +2
-3u32 pat = xe->pat.pat_pta->value;drm_printf (p,"Page Table Access:\n" ); -xe2_pat_entry_dump (p,"PTA_MODE" , pat, false); + xe->pat.ops->entry_dump (p,"PTA_MODE" , pat, false); }if (xe->pat.pat_ats) {u32 pat = xe->pat.pat_ats->value;drm_printf (p,"PCIe ATS/PASID:\n" ); -xe2_pat_entry_dump (p,"PAT_ATS " , pat, false); + xe->pat.ops->entry_dump (p,"PAT_ATS " , pat, false); }drm_printf (p,"Cache Level:\n" ); --2.43.0