drm/xe: Fix devcoredump readout of IPEHR

It was reading (base) + 0x8c but that is not a valid register
and instead it should read (base) + 0x68.
So here reading the correct register and removing the wrong and
duplicated.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
index 692213d09ceaabb288bfbd00771c367ef54649a2..792d431161c68ec4ce4cd2859279ae0a3d97a7cf 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
@@ -37,7 +37,6 @@
 #define RING_DMA_FADD(base)                    XE_REG((base) + 0x78)
 #define RING_HWS_PGA(base)                     XE_REG((base) + 0x80)
 #define IPEIR(base)                            XE_REG((base) + 0x88)
-#define IPEHR(base)                            XE_REG((base) + 0x8c)
 #define RING_HWSTAM(base)                      XE_REG((base) + 0x98)
 #define RING_MI_MODE(base)                     XE_REG((base) + 0x9c)
 #define RING_NOPID(base)                       XE_REG((base) + 0x94)

diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index dc9dd83d99c52e948f23da7e481c58d5f4824888..c2db391cf26748a5f35d72738de8286ae4fe8deb 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -728,7 +728,7 @@ xe_hw_engine_snapshot_capture(struct xe_hw_engine *hwe)
        snapshot->reg.ring_dma_fadd =
                hw_engine_mmio_read32(hwe, RING_DMA_FADD(0));
        snapshot->reg.ipeir = hw_engine_mmio_read32(hwe, IPEIR(0));
-       snapshot->reg.ipehr = hw_engine_mmio_read32(hwe, IPEHR(0));
+       snapshot->reg.ipehr = hw_engine_mmio_read32(hwe, RING_IPEHR(0));
 
        if (snapshot->class == XE_ENGINE_CLASS_COMPUTE)
                snapshot->reg.rcu_mode = xe_mmio_read32(hwe->gt, RCU_MODE);