From: Matt Roper <matthew.d.roper@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: matthew.d.roper@intel.com
Subject: [PATCH] drm/xe: Remove duplicate RING_MAX_NONPRIV_SLOTS definition
Date: Tue, 12 Dec 2023 13:56:04 -0800 [thread overview]
Message-ID: <20231212215603.2041841-2-matthew.d.roper@intel.com> (raw)
The engine register header wound up with two definitions for
RING_MAX_NONPRIV_SLOTS, likely due to a rebase mistake. Keep the
definition that's in an appropriate place (i.e., with the
FORCE_TO_NONPRIV register definition) and remove the other.
Signed-off-by: Matt Roper <matthew.d.roper@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 3942db268b01..1a857c4edcf5 100644
--- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
@@ -40,7 +40,6 @@
#define RING_NOPID(base) XE_REG((base) + 0x94)
#define RING_IMR(base) XE_REG((base) + 0xa8)
-#define RING_MAX_NONPRIV_SLOTS 12
#define RING_EIR(base) XE_REG((base) + 0xb0)
#define RING_EMR(base) XE_REG((base) + 0xb4)
--
2.43.0
next reply other threads:[~2023-12-12 21:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 21:56 Matt Roper [this message]
2023-12-13 1:01 ` [PATCH] drm/xe: Remove duplicate RING_MAX_NONPRIV_SLOTS definition Matthew Brost
2023-12-13 1:06 ` ✓ CI.Patch_applied: success for " Patchwork
2023-12-13 1:06 ` ✓ CI.checkpatch: " Patchwork
2023-12-13 1:07 ` ✓ CI.KUnit: " Patchwork
2023-12-13 1:14 ` ✓ CI.Build: " Patchwork
2023-12-13 1:15 ` ✓ CI.Hooks: " Patchwork
2023-12-13 1:16 ` ✓ CI.checksparse: " Patchwork
2023-12-13 1:50 ` ✓ CI.BAT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231212215603.2041841-2-matthew.d.roper@intel.com \
--to=matthew.d.roper@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox