drm/xe/rtp: Generalize whitelist_apply_to_hwe

Generalize whitelist_apply_to_hwe to construct both non-OA and OA
whitelist nonpriv registers.

Fixes: 828a8eaf37c3 ("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-5-ashutosh.dixit@intel.com
(cherry picked from commit c3ff77d7235ccef7a0883c2fd981f70ef3aafd21)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --git a/drivers/gpu/drm/xe/xe_reg_whitelist.c b/drivers/gpu/drm/xe/xe_reg_whitelist.c
index b5ae7d26e5ba3b41d6b2971ea99e7d78b77e9bf7..e9d0a0b82527dba6a8913e66a6f7d14a69379014 100644 (file)
--- a/drivers/gpu/drm/xe/xe_reg_whitelist.c
+++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c
@@ -161,9 +161,10 @@ static const struct xe_rtp_table_sr oa_whitelist = XE_RTP_TABLE_SR(
        },
 );
 
-static int whitelist_apply_to_hwe(struct xe_hw_engine *hwe)
+static int whitelist_apply_to_hwe(struct xe_hw_engine *hwe, struct xe_reg_sr *in,
+                                 struct xe_reg_sr *out, int first_slot)
 {
-       struct xe_reg_sr *sr = &hwe->reg_whitelist;
+       struct xe_reg_sr *sr = in;
        struct xe_reg_sr_entry *entry;
        struct drm_printer p;
        unsigned long reg;
@@ -172,7 +173,7 @@ static int whitelist_apply_to_hwe(struct xe_hw_engine *hwe)
        xe_gt_dbg(hwe->gt, "Add %s whitelist to engine\n", sr->name);
        p = xe_gt_dbg_printer(hwe->gt);
 
-       slot = 0;
+       slot = first_slot;
        xa_for_each(&sr->xa, reg, entry) {
                struct xe_reg_sr_entry hwe_entry = {
                        .reg = RING_FORCE_TO_NONPRIV(hwe->mmio_base, slot),
@@ -189,7 +190,7 @@ static int whitelist_apply_to_hwe(struct xe_hw_engine *hwe)
                }
 
                xe_reg_whitelist_print_entry(&p, 0, reg, entry);
-               xe_reg_sr_add(&hwe->reg_sr, &hwe_entry, hwe->gt);
+               xe_reg_sr_add(out, &hwe_entry, hwe->gt);
 
                slot++;
        }
@@ -211,7 +212,7 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe)
        int first_oa_slot;
 
        xe_rtp_process_to_sr(&ctx, &register_whitelist, &hwe->reg_whitelist, false);
-       first_oa_slot = whitelist_apply_to_hwe(hwe);
+       first_oa_slot = whitelist_apply_to_hwe(hwe, &hwe->reg_whitelist, &hwe->reg_sr, 0);
 
        xe_rtp_process_to_sr(&ctx, &oa_whitelist, &hwe->oa_whitelist, false);
 }