From: Matt Roper <matthew.d.roper@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: matthew.d.roper@intel.com
Subject: [PATCH 4/8] drm/xe: Move engine base offsets to engine register header
Date: Thu, 14 Dec 2023 10:47:04 -0800 [thread overview]
Message-ID: <20231214184659.2249559-14-matthew.d.roper@intel.com> (raw)
In-Reply-To: <20231214184659.2249559-10-matthew.d.roper@intel.com>
These offsets are primarily used as parameters for the engine register
definitions, so it makes more sense to define them in the engine header
rather than the general register header.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/xe/regs/xe_engine_regs.h | 33 ++++++++++++++++++++++++
drivers/gpu/drm/xe/regs/xe_regs.h | 28 --------------------
2 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/xe/regs/xe_engine_regs.h b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
index 7f82bef3a0db..5592774fc690 100644
--- a/drivers/gpu/drm/xe/regs/xe_engine_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_engine_regs.h
@@ -10,6 +10,39 @@
#include "regs/xe_reg_defs.h"
+/*
+ * These *_BASE values represent the MMIO offset where each hardware engine's
+ * registers start. The other definitions in this header are parameterized
+ * macros that will take one of these values as a parameter.
+ */
+#define RENDER_RING_BASE 0x02000
+#define BSD_RING_BASE 0x1c0000
+#define BSD2_RING_BASE 0x1c4000
+#define BSD3_RING_BASE 0x1d0000
+#define BSD4_RING_BASE 0x1d4000
+#define XEHP_BSD5_RING_BASE 0x1e0000
+#define XEHP_BSD6_RING_BASE 0x1e4000
+#define XEHP_BSD7_RING_BASE 0x1f0000
+#define XEHP_BSD8_RING_BASE 0x1f4000
+#define VEBOX_RING_BASE 0x1c8000
+#define VEBOX2_RING_BASE 0x1d8000
+#define XEHP_VEBOX3_RING_BASE 0x1e8000
+#define XEHP_VEBOX4_RING_BASE 0x1f8000
+#define COMPUTE0_RING_BASE 0x1a000
+#define COMPUTE1_RING_BASE 0x1c000
+#define COMPUTE2_RING_BASE 0x1e000
+#define COMPUTE3_RING_BASE 0x26000
+#define BLT_RING_BASE 0x22000
+#define XEHPC_BCS1_RING_BASE 0x3e0000
+#define XEHPC_BCS2_RING_BASE 0x3e2000
+#define XEHPC_BCS3_RING_BASE 0x3e4000
+#define XEHPC_BCS4_RING_BASE 0x3e6000
+#define XEHPC_BCS5_RING_BASE 0x3e8000
+#define XEHPC_BCS6_RING_BASE 0x3ea000
+#define XEHPC_BCS7_RING_BASE 0x3ec000
+#define XEHPC_BCS8_RING_BASE 0x3ee000
+#define GSCCS_RING_BASE 0x11a000
+
#define RING_TAIL(base) XE_REG((base) + 0x30)
#define RING_HEAD(base) XE_REG((base) + 0x34)
diff --git a/drivers/gpu/drm/xe/regs/xe_regs.h b/drivers/gpu/drm/xe/regs/xe_regs.h
index 4b427ec8cbff..b7d3b42ec003 100644
--- a/drivers/gpu/drm/xe/regs/xe_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_regs.h
@@ -7,38 +7,10 @@
#include "regs/xe_reg_defs.h"
-#define RENDER_RING_BASE 0x02000
-#define BSD_RING_BASE 0x1c0000
-#define BSD2_RING_BASE 0x1c4000
-#define BSD3_RING_BASE 0x1d0000
-#define BSD4_RING_BASE 0x1d4000
-#define XEHP_BSD5_RING_BASE 0x1e0000
-#define XEHP_BSD6_RING_BASE 0x1e4000
-#define XEHP_BSD7_RING_BASE 0x1f0000
-#define XEHP_BSD8_RING_BASE 0x1f4000
-#define VEBOX_RING_BASE 0x1c8000
-#define VEBOX2_RING_BASE 0x1d8000
-#define XEHP_VEBOX3_RING_BASE 0x1e8000
-#define XEHP_VEBOX4_RING_BASE 0x1f8000
-#define COMPUTE0_RING_BASE 0x1a000
-#define COMPUTE1_RING_BASE 0x1c000
-#define COMPUTE2_RING_BASE 0x1e000
-#define COMPUTE3_RING_BASE 0x26000
-#define BLT_RING_BASE 0x22000
-#define XEHPC_BCS1_RING_BASE 0x3e0000
-#define XEHPC_BCS2_RING_BASE 0x3e2000
-#define XEHPC_BCS3_RING_BASE 0x3e4000
-#define XEHPC_BCS4_RING_BASE 0x3e6000
-#define XEHPC_BCS5_RING_BASE 0x3e8000
-#define XEHPC_BCS6_RING_BASE 0x3ea000
-#define XEHPC_BCS7_RING_BASE 0x3ec000
-#define XEHPC_BCS8_RING_BASE 0x3ee000
-
#define DG1_GSC_HECI2_BASE 0x00259000
#define PVC_GSC_HECI2_BASE 0x00285000
#define DG2_GSC_HECI2_BASE 0x00374000
-#define GSCCS_RING_BASE 0x11a000
#define GT_WAIT_SEMAPHORE_INTERRUPT REG_BIT(11)
#define GT_CONTEXT_SWITCH_INTERRUPT REG_BIT(8)
#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT REG_BIT(4)
--
2.43.0
next prev parent reply other threads:[~2023-12-14 18:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-14 18:47 [PATCH 0/8] Trivial register cleanups Matt Roper
2023-12-14 18:47 ` [PATCH 1/8] drm/xe: Drop "_REG" suffix from CSFE_CHICKEN1 Matt Roper
2023-12-14 21:55 ` Lucas De Marchi
2023-12-14 18:47 ` [PATCH 2/8] drm/xe: Move some per-engine register definitions to the engine header Matt Roper
2023-12-14 22:01 ` Lucas De Marchi
2023-12-14 18:47 ` [PATCH 3/8] drm/xe: Fix whitespace in register definitions Matt Roper
2023-12-14 22:09 ` Lucas De Marchi
2023-12-14 18:47 ` Matt Roper [this message]
2023-12-14 22:08 ` [PATCH 4/8] drm/xe: Move engine base offsets to engine register header Lucas De Marchi
2023-12-14 18:47 ` [PATCH 5/8] drm/xe: Move GSC HECI base offsets out of " Matt Roper
2023-12-14 22:06 ` Lucas De Marchi
2023-12-14 18:47 ` [PATCH 6/8] drm/xe: Define interrupt vector bits with the interrupt registers Matt Roper
2023-12-14 22:10 ` Lucas De Marchi
2023-12-14 18:47 ` [PATCH 7/8] drm/xe: Re-sort GT register header Matt Roper
2023-12-14 22:21 ` Lucas De Marchi
2023-12-14 23:11 ` Matt Roper
2023-12-14 23:38 ` Lucas De Marchi
2023-12-14 18:47 ` [PATCH 8/8] drm/xe: Drop some unnecessary header includes Matt Roper
2023-12-14 22:21 ` Lucas De Marchi
2023-12-14 19:41 ` ✓ CI.Patch_applied: success for Trivial register cleanups Patchwork
2023-12-14 19:42 ` ✓ CI.checkpatch: " Patchwork
2023-12-14 19:43 ` ✓ CI.KUnit: " Patchwork
2023-12-14 19:50 ` ✓ CI.Build: " Patchwork
2023-12-14 19:51 ` ✓ CI.Hooks: " Patchwork
2023-12-14 19:52 ` ✓ CI.checksparse: " Patchwork
2023-12-14 20:27 ` ✓ CI.BAT: " Patchwork
2023-12-15 0:07 ` Matt Roper
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=20231214184659.2249559-14-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