Skip to content

Commit

Permalink
drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
Browse files Browse the repository at this point in the history
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: stable@vger.kernel.org # v6.8-rc1+
Fixes: b79e8fd ("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>
  • Loading branch information
Mingcong Bai authored and Rodrigo Vivi committed Feb 26, 2025
1 parent 35359c3 commit 6b68c45
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/gpu/drm/xe/regs/xe_engine_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 6b68c45

Please sign in to comment.