Unverified Commit f2ba0cf1 authored by Mingcong Bai's avatar Mingcong Bai Committed by Rodrigo Vivi
Browse files

drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size) 



Commit b79e8fd9 ("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: b79e8fd9 ("drm/xe: Remove dependency on intel_engine_regs.h")
Signed-off-by: default avatarMingcong Bai <jeffbai@aosc.io>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250225073104.865230-1-jeffbai@aosc.io


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 6b68c454)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 5bd56670

drivers/gpu/drm/xe/regs/xe_engine_regs.h

+0 −1
Original line number Diff line number Diff line
@@ -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)