]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 17:25:38 +0000 (18:25 +0100)
commit610c6e77a711be5ae743da2af4a97968674cf72c
treebcbcd5182bc5d5a3bba23049c957a7f33efed84b
parent322cb23e24c8e3cbe843499fe6fc6fbd9138362e
drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)

commit f2ba0cf1ca32e075617813de98c826ab55d57f11 upstream.

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>
(cherry picked from commit 6b68c4542ffecc36087a9e14db8fc990c88bb01b)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/regs/xe_engine_regs.h