drm/xe: Define interrupt vector bits with the interrupt registers

The bit definitions had become a bit orphaned; move them to the same
location as the interrupt registers that they're used with.

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20231214184659.2249559-16-matthew.d.roper@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
index 4448507ef4caa012ba71288affd871f4b45afd9f..2c48de2076a600ae015cddfb96c7889c0ada471c 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
@@ -456,6 +456,11 @@
 #define XEHPC_BCS3_BCS4_INTR_MASK              XE_REG(0x190114)
 #define XEHPC_BCS5_BCS6_INTR_MASK              XE_REG(0x190118)
 #define XEHPC_BCS7_BCS8_INTR_MASK              XE_REG(0x19011c)
+#define   GT_WAIT_SEMAPHORE_INTERRUPT          REG_BIT(11)
+#define   GT_CONTEXT_SWITCH_INTERRUPT          REG_BIT(8)
+#define   GT_RENDER_PIPECTL_NOTIFY_INTERRUPT   REG_BIT(4)
+#define   GT_CS_MASTER_ERROR_INTERRUPT         REG_BIT(3)
+#define   GT_RENDER_USER_INTERRUPT             REG_BIT(0)
 
 #define PVC_GT0_PACKAGE_ENERGY_STATUS          XE_REG(0x281004)
 #define PVC_GT0_PACKAGE_RAPL_LIMIT             XE_REG(0x281008)

diff --git a/drivers/gpu/drm/xe/regs/xe_regs.h b/drivers/gpu/drm/xe/regs/xe_regs.h
index 67ce087e21d08a3f6073ac371355a8e3b48396df..2c214bb9b67141130b8d1f5375d2b98b918b19c0 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_regs.h
@@ -7,12 +7,6 @@
 
 #include "regs/xe_reg_defs.h"
 
-#define   GT_WAIT_SEMAPHORE_INTERRUPT          REG_BIT(11)
-#define   GT_CONTEXT_SWITCH_INTERRUPT          REG_BIT(8)
-#define   GT_RENDER_PIPECTL_NOTIFY_INTERRUPT   REG_BIT(4)
-#define   GT_CS_MASTER_ERROR_INTERRUPT         REG_BIT(3)
-#define   GT_RENDER_USER_INTERRUPT             REG_BIT(0)
-
 #define TIMESTAMP_OVERRIDE                                     XE_REG(0x44074)
 #define   TIMESTAMP_OVERRIDE_US_COUNTER_DENOMINATOR_MASK       REG_GENMASK(15, 12)
 #define   TIMESTAMP_OVERRIDE_US_COUNTER_DIVIDER_MASK           REG_GENMASK(9, 0)

diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index 86b863b9906589cd0021738ecb2e01a5efb7e6ec..1fa5cf5eea9785a2f4889ef7ee14799bf2de37f6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -9,7 +9,6 @@
 
 #include "regs/xe_engine_regs.h"
 #include "regs/xe_gt_regs.h"
-#include "regs/xe_regs.h"
 #include "xe_assert.h"
 #include "xe_bo.h"
 #include "xe_device.h"