aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Roper <[email protected]>2023-12-12 13:56:04 -0800
committerRodrigo Vivi <[email protected]>2023-12-21 11:46:09 -0500
commit7a18d36f88105c0964846dbf9f7f1b0d43e860db (patch)
tree56a9ea96bf749900e8bd9620a28138b35f89c0c9
parenteb9702ad29863c1ae41d17d8504c7444f280dfff (diff)
drm/xe: Remove duplicate RING_MAX_NONPRIV_SLOTS definition
The engine register header wound up with two definitions for RING_MAX_NONPRIV_SLOTS, likely due to a rebase mistake. Keep the definition that's in an appropriate place (i.e., with the FORCE_TO_NONPRIV register definition) and remove the other. Reviewed-by: Matthew Brost <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Matt Roper <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]>
-rw-r--r--drivers/gpu/drm/xe/regs/xe_engine_regs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
index 3942db268b01..1a857c4edcf5 100644
--- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
@@ -40,7 +40,6 @@
#define RING_NOPID(base) XE_REG((base) + 0x94)
#define RING_IMR(base) XE_REG((base) + 0xa8)
-#define RING_MAX_NONPRIV_SLOTS 12
#define RING_EIR(base) XE_REG((base) + 0xb0)
#define RING_EMR(base) XE_REG((base) + 0xb4)