drm/xe/oa: Use explicit struct initialization for struct xe_oa_regs

Use explicit struct initialization for struct xe_oa_regs to reduce chance
of error. Also add .oa_mmio_trg field to struct for completeness.

Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Link: https://patch.msgid.link/20251202025115.373546-2-ashutosh.dixit@intel.com

diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 890c363282ae6ae52868eb19f2f3d455144daaff..75db5530cb557f3a502e2dbe9f2c3d64b593155f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -2566,30 +2566,32 @@ static u32 __hwe_oa_unit(struct xe_hw_engine *hwe)
 static struct xe_oa_regs __oam_regs(u32 base)
 {
        return (struct xe_oa_regs) {
-               base,
-               OAM_HEAD_POINTER(base),
-               OAM_TAIL_POINTER(base),
-               OAM_BUFFER(base),
-               OAM_CONTEXT_CONTROL(base),
-               OAM_CONTROL(base),
-               OAM_DEBUG(base),
-               OAM_STATUS(base),
-               OAM_CONTROL_COUNTER_SEL_MASK,
+               .base           = base,
+               .oa_head_ptr    = OAM_HEAD_POINTER(base),
+               .oa_tail_ptr    = OAM_TAIL_POINTER(base),
+               .oa_buffer      = OAM_BUFFER(base),
+               .oa_ctx_ctrl    = OAM_CONTEXT_CONTROL(base),
+               .oa_ctrl        = OAM_CONTROL(base),
+               .oa_debug       = OAM_DEBUG(base),
+               .oa_status      = OAM_STATUS(base),
+               .oa_mmio_trg    = OAM_MMIO_TRG(base),
+               .oa_ctrl_counter_select_mask = OAM_CONTROL_COUNTER_SEL_MASK,
        };
 }
 
 static struct xe_oa_regs __oag_regs(void)
 {
        return (struct xe_oa_regs) {
-               0,
-               OAG_OAHEADPTR,
-               OAG_OATAILPTR,
-               OAG_OABUFFER,
-               OAG_OAGLBCTXCTRL,
-               OAG_OACONTROL,
-               OAG_OA_DEBUG,
-               OAG_OASTATUS,
-               OAG_OACONTROL_OA_COUNTER_SEL_MASK,
+               .base           = 0,
+               .oa_head_ptr    = OAG_OAHEADPTR,
+               .oa_tail_ptr    = OAG_OATAILPTR,
+               .oa_buffer      = OAG_OABUFFER,
+               .oa_ctx_ctrl    = OAG_OAGLBCTXCTRL,
+               .oa_ctrl        = OAG_OACONTROL,
+               .oa_debug       = OAG_OA_DEBUG,
+               .oa_status      = OAG_OASTATUS,
+               .oa_mmio_trg    = OAG_MMIOTRIGGER,
+               .oa_ctrl_counter_select_mask = OAG_OACONTROL_OA_COUNTER_SEL_MASK,
        };
 }
 

diff --git a/drivers/gpu/drm/xe/xe_oa_types.h b/drivers/gpu/drm/xe/xe_oa_types.h
index cf080f4121893e79cb6b9bb575cd1524b3792c63..08cc8d7c221582662abff9397e27fbb8ccca468a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_oa_types.h
+++ b/drivers/gpu/drm/xe/xe_oa_types.h
@@ -87,6 +87,7 @@ struct xe_oa_regs {
        struct xe_reg oa_ctrl;
        struct xe_reg oa_debug;
        struct xe_reg oa_status;
+       struct xe_reg oa_mmio_trg;
        u32 oa_ctrl_counter_select_mask;
 };