* [PATCH] drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
@ 2025-02-25 7:31 Mingcong Bai
2025-02-25 23:34 ` Matthew Brost
0 siblings, 1 reply; 3+ messages in thread
From: Mingcong Bai @ 2025-02-25 7:31 UTC (permalink / raw)
To: linux-kernel
Cc: Kexy Biscuit, stable, Mingcong Bai, Lucas De Marchi,
Thomas Hellström, Rodrigo Vivi, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Simona Vetter,
Matt Roper, Ashutosh Dixit, Niranjana Vishwanathapura,
Pallavi Mishra, José Roberto de Souza, Ilia Levi, intel-xe,
dri-devel
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>
---
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
index d86219dedde2a..b732c89816dff 100644
--- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
@@ -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)
--
2.48.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
2025-02-25 7:31 [PATCH] drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size) Mingcong Bai
@ 2025-02-25 23:34 ` Matthew Brost
2025-02-26 2:20 ` Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Brost @ 2025-02-25 23:34 UTC (permalink / raw)
To: Mingcong Bai
Cc: linux-kernel, Kexy Biscuit, stable, Lucas De Marchi,
Thomas Hellström, Rodrigo Vivi, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, David Airlie, Simona Vetter,
Matt Roper, Ashutosh Dixit, Niranjana Vishwanathapura,
Pallavi Mishra, José Roberto de Souza, Ilia Levi, intel-xe,
dri-devel
On Tue, Feb 25, 2025 at 03:31:01PM +0800, Mingcong Bai wrote:
> 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>
> ---
> drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> index d86219dedde2a..b732c89816dff 100644
> --- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> +++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> @@ -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)
>
> --
> 2.48.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size)
2025-02-25 23:34 ` Matthew Brost
@ 2025-02-26 2:20 ` Rodrigo Vivi
0 siblings, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2025-02-26 2:20 UTC (permalink / raw)
To: Matthew Brost
Cc: Mingcong Bai, linux-kernel, Kexy Biscuit, stable, Lucas De Marchi,
Thomas Hellström, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Matt Roper,
Ashutosh Dixit, Niranjana Vishwanathapura, Pallavi Mishra,
José Roberto de Souza, Ilia Levi, intel-xe, dri-devel
On Tue, Feb 25, 2025 at 03:34:03PM -0800, Matthew Brost wrote:
> On Tue, Feb 25, 2025 at 03:31:01PM +0800, Mingcong Bai wrote:
> > 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>
pushed to drm-xe-next, thank you both
>
> > ---
> > drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> > index d86219dedde2a..b732c89816dff 100644
> > --- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> > +++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
> > @@ -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)
> >
> > --
> > 2.48.1
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-26 2:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 7:31 [PATCH] drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size) Mingcong Bai
2025-02-25 23:34 ` Matthew Brost
2025-02-26 2:20 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox