Skip to content

Commit f2ba0cf

Browse files
MingcongBairodrigovivi
authored andcommitted
drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
Commit b79e8fd ("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: [email protected] # v6.8-rc1+ Fixes: b79e8fd ("drm/xe: Remove dependency on intel_engine_regs.h") Signed-off-by: Mingcong Bai <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]> (cherry picked from commit 6b68c45) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 5bd5667 commit f2ba0cf

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
#define RING_CTL(base) XE_REG((base) + 0x3c)
5555
#define RING_CTL_SIZE(size) ((size) - PAGE_SIZE) /* in bytes -> pages */
56-
#define RING_CTL_SIZE(size) ((size) - PAGE_SIZE) /* in bytes -> pages */
5756

5857
#define RING_START_UDW(base) XE_REG((base) + 0x48)
5958

0 commit comments

Comments
 (0)