]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
authorMingcong Bai <jeffbai@aosc.io>
Tue, 25 Feb 2025 07:31:01 +0000 (15:31 +0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 26 Feb 2025 02:17:38 +0000 (21:17 -0500)
Commit b79e8fd954c4 ("drm/xe: Remove dependency on intel_engine_regs.h")
introduced an internal set of engine registers, however, as part of this
change, it has also introduced two duplicate `define' lines for
`RING_CTL_SIZE(size)'. This commit was introduced to the tree in v6.8-rc1.

While this is harmless as the definitions did not change, so no compiler
warning was observed.

Drop this line anyway for the sake of correctness.

Cc: stable@vger.kernel.org # v6.8-rc1+
Fixes: b79e8fd954c4 ("drm/xe: Remove dependency on intel_engine_regs.h")
Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250225073104.865230-1-jeffbai@aosc.io
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/regs/xe_engine_regs.h

index c8fd3d5ca502636f5e5a264d306992eeb448b048..4f372dc2cb891448e712dcc9952dec6bf5f2b7eb 100644 (file)
@@ -53,7 +53,6 @@
 
 #define RING_CTL(base)                         XE_REG((base) + 0x3c)
 #define   RING_CTL_SIZE(size)                  ((size) - PAGE_SIZE) /* in bytes -> pages */
-#define   RING_CTL_SIZE(size)                  ((size) - PAGE_SIZE) /* in bytes -> pages */
 
 #define RING_START_UDW(base)                   XE_REG((base) + 0x48)