drm/xe: Store xe_hw_engine in xe_hw_engine_snapshot

A future patch will require gt and xe device structs, so here
replacing class by hwe.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Zhanjun Dong <zhanjun.dong@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240424140319.61651-1-jose.souza@intel.com

diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index 455f375..c84dbe8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -791,7 +791,7 @@ xe_hw_engine_snapshot_capture(struct xe_hw_engine *hwe)
                return NULL;
 
        snapshot->name = kstrdup(hwe->name, GFP_ATOMIC);
-       snapshot->class = hwe->class;
+       snapshot->hwe = hwe;
        snapshot->logical_instance = hwe->logical_instance;
        snapshot->forcewake.domain = hwe->domain;
        snapshot->forcewake.ref = xe_force_wake_ref(gt_to_fw(hwe->gt),
@@ -842,7 +842,7 @@ xe_hw_engine_snapshot_capture(struct xe_hw_engine *hwe)
        snapshot->reg.ring_eir = hw_engine_mmio_read32(hwe, RING_EIR(0));
        snapshot->reg.ipehr = hw_engine_mmio_read32(hwe, RING_IPEHR(0));
 
-       if (snapshot->class == XE_ENGINE_CLASS_COMPUTE)
+       if (snapshot->hwe->class == XE_ENGINE_CLASS_COMPUTE)
                snapshot->reg.rcu_mode = xe_mmio_read32(hwe->gt, RCU_MODE);
 
        return snapshot;
@@ -887,7 +887,7 @@ void xe_hw_engine_snapshot_print(struct xe_hw_engine_snapshot *snapshot,
        drm_printf(p, "\tBBADDR: 0x%016llx\n", snapshot->reg.ring_bbaddr);
        drm_printf(p, "\tDMA_FADDR: 0x%016llx\n", snapshot->reg.ring_dma_fadd);
        drm_printf(p, "\tIPEHR: 0x%08x\n", snapshot->reg.ipehr);
-       if (snapshot->class == XE_ENGINE_CLASS_COMPUTE)
+       if (snapshot->hwe->class == XE_ENGINE_CLASS_COMPUTE)
                drm_printf(p, "\tRCU_MODE: 0x%08x\n",
                           snapshot->reg.rcu_mode);
 }

diff --git a/drivers/gpu/drm/xe/xe_hw_engine_types.h b/drivers/gpu/drm/xe/xe_hw_engine_types.h
index d7f828c..27deaa3 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_engine_types.h
+++ b/drivers/gpu/drm/xe/xe_hw_engine_types.h
@@ -158,8 +158,8 @@ struct xe_hw_engine {
 struct xe_hw_engine_snapshot {
        /** @name: name of the hw engine */
        char *name;
-       /** @class: class of this hw engine */
-       enum xe_engine_class class;
+       /** @hwe: hw engine */
+       struct xe_hw_engine *hwe;
        /** @logical_instance: logical instance of this hw engine */
        u16 logical_instance;
        /** @forcewake: Force Wake information snapshot */