On Tue, Oct 29, 2024 at 10:30:33AM +0100, Geert Uytterhoeven wrote:
Merging commits e1f813947ccf2326 ("drm/xe/xe2: Extend performance tuning
to media GT") and 876253165f3eaaac ("drm/xe/xe2: Add performance tuning
for L3 cache flushing") with their upstream counterparts
6ef5a04221aaeb85 and 3bf90935aafc750c accidentally left multiple
identical copies of the XE2LPM_L3SQCREG2, XE2LPM_L3SQCREG3, and
XE2LPM_SCRATCH3_LBCF register definitions.
Fixes: 26bb2dc102783fef ("Merge tag 'drm-xe-next-2024-10-10' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next")
Dave, this is only in drm-next. It doesn't show up in drm-xe-next
or in drm-tip neither since it's undone by the next merge of
drm-next into drm-tip. Can you take it directly in drm-next?
Acked-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
thanks
Lucas De Marchi
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
---
drivers/gpu/drm/xe/regs/xe_gt_regs.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
index d428d04164d9d3df..42dc55cb23f4a334 100644
--- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
@@ -410,12 +410,6 @@
#define XE2LPM_SCRATCH3_LBCF XE_REG_MCR(0xb654)
-#define XE2LPM_L3SQCREG2 XE_REG_MCR(0xb604)
-
-#define XE2LPM_L3SQCREG3 XE_REG_MCR(0xb608)
-
-#define XE2LPM_SCRATCH3_LBCF XE_REG_MCR(0xb654)
-
#define XE2LPM_L3SQCREG5 XE_REG_MCR(0xb658)
#define XE2_TDF_CTRL XE_REG(0xb418)
--
2.34.1
