| Message ID | 20250225073104.865230-1-jeffbai@aosc.io (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/xe/regs: remove a duplicate definition for RING_CTL_SIZE(size) | expand |
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 >
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 > >
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)
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(-)