From: Jani Nikula <jani.nikula@linux.intel.com>
To: Matt Roper <matthew.d.roper@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 1/7] drm/i915: Use parameterized GPR register definitions everywhere
Date: Mon, 10 Jan 2022 13:20:51 +0200 [thread overview]
Message-ID: <87czkzalbg.fsf@intel.com> (raw)
In-Reply-To: <20220108044055.3123418-2-matthew.d.roper@intel.com>
On Fri, 07 Jan 2022, Matt Roper <matthew.d.roper@intel.com> wrote:
> Since we have an engine-parameterized macro GEN8_RING_CS_GPR, let's use
> that in place of the HSW_CS_GPR and BCS_GPR register definitions.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_cmd_parser.c | 68 ++++++++++++++------------
> drivers/gpu/drm/i915/i915_reg.h | 8 ---
> 2 files changed, 36 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> index e0403ce9ce69..20191a32478a 100644
> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> @@ -591,6 +591,10 @@ struct drm_i915_reg_descriptor {
> { .addr = _reg(idx) }, \
> { .addr = _reg ## _UDW(idx) }
>
> +#define REG64_BASE_IDX(_reg, base, idx) \
> + { .addr = _reg(base, idx) }, \
> + { .addr = _reg ## _UDW(base, idx) }
> +
> static const struct drm_i915_reg_descriptor gen7_render_regs[] = {
> REG64(GPGPU_THREADS_DISPATCHED),
> REG64(HS_INVOCATION_COUNT),
> @@ -636,22 +640,22 @@ static const struct drm_i915_reg_descriptor gen7_render_regs[] = {
> };
>
> static const struct drm_i915_reg_descriptor hsw_render_regs[] = {
> - REG64_IDX(HSW_CS_GPR, 0),
> - REG64_IDX(HSW_CS_GPR, 1),
> - REG64_IDX(HSW_CS_GPR, 2),
> - REG64_IDX(HSW_CS_GPR, 3),
> - REG64_IDX(HSW_CS_GPR, 4),
> - REG64_IDX(HSW_CS_GPR, 5),
> - REG64_IDX(HSW_CS_GPR, 6),
> - REG64_IDX(HSW_CS_GPR, 7),
> - REG64_IDX(HSW_CS_GPR, 8),
> - REG64_IDX(HSW_CS_GPR, 9),
> - REG64_IDX(HSW_CS_GPR, 10),
> - REG64_IDX(HSW_CS_GPR, 11),
> - REG64_IDX(HSW_CS_GPR, 12),
> - REG64_IDX(HSW_CS_GPR, 13),
> - REG64_IDX(HSW_CS_GPR, 14),
> - REG64_IDX(HSW_CS_GPR, 15),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 0),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 1),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 2),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 3),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 4),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 5),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 6),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 7),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 8),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 9),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 10),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 11),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 12),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 13),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 14),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, RENDER_RING_BASE, 15),
> REG32(HSW_SCRATCH1,
> .mask = ~HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE,
> .value = 0),
> @@ -674,22 +678,22 @@ static const struct drm_i915_reg_descriptor gen9_blt_regs[] = {
> REG32(BCS_SWCTRL),
> REG64_IDX(RING_TIMESTAMP, BLT_RING_BASE),
> REG32_IDX(RING_CTX_TIMESTAMP, BLT_RING_BASE),
> - REG64_IDX(BCS_GPR, 0),
> - REG64_IDX(BCS_GPR, 1),
> - REG64_IDX(BCS_GPR, 2),
> - REG64_IDX(BCS_GPR, 3),
> - REG64_IDX(BCS_GPR, 4),
> - REG64_IDX(BCS_GPR, 5),
> - REG64_IDX(BCS_GPR, 6),
> - REG64_IDX(BCS_GPR, 7),
> - REG64_IDX(BCS_GPR, 8),
> - REG64_IDX(BCS_GPR, 9),
> - REG64_IDX(BCS_GPR, 10),
> - REG64_IDX(BCS_GPR, 11),
> - REG64_IDX(BCS_GPR, 12),
> - REG64_IDX(BCS_GPR, 13),
> - REG64_IDX(BCS_GPR, 14),
> - REG64_IDX(BCS_GPR, 15),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 0),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 1),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 2),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 3),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 4),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 5),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 6),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 7),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 8),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 9),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 10),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 11),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 12),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 13),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 14),
> + REG64_BASE_IDX(GEN8_RING_CS_GPR, BLT_RING_BASE, 15),
> };
>
> #undef REG64
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index e20e832162b4..86e459010465 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -599,10 +599,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
> #define BCS_SRC_Y REG_BIT(0)
> #define BCS_DST_Y REG_BIT(1)
>
> -/* There are 16 GPR registers */
> -#define BCS_GPR(n) _MMIO(0x22600 + (n) * 8)
> -#define BCS_GPR_UDW(n) _MMIO(0x22600 + (n) * 8 + 4)
> -
> #define GPGPU_THREADS_DISPATCHED _MMIO(0x2290)
> #define GPGPU_THREADS_DISPATCHED_UDW _MMIO(0x2290 + 4)
> #define HS_INVOCATION_COUNT _MMIO(0x2300)
> @@ -646,10 +642,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
> #define GEN7_GPGPU_DISPATCHDIMY _MMIO(0x2504)
> #define GEN7_GPGPU_DISPATCHDIMZ _MMIO(0x2508)
>
> -/* There are the 16 64-bit CS General Purpose Registers */
> -#define HSW_CS_GPR(n) _MMIO(0x2600 + (n) * 8)
> -#define HSW_CS_GPR_UDW(n) _MMIO(0x2600 + (n) * 8 + 4)
> -
> #define GEN7_OACONTROL _MMIO(0x2360)
> #define GEN7_OACONTROL_CTX_MASK 0xFFFFF000
> #define GEN7_OACONTROL_TIMER_PERIOD_MASK 0x3F
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2022-01-10 11:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 4:40 [Intel-gfx] [PATCH v2 0/7] Start cleaning up register definitions Matt Roper
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 1/7] drm/i915: Use parameterized GPR register definitions everywhere Matt Roper
2022-01-10 11:20 ` Jani Nikula [this message]
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 2/7] drm/i915: Parameterize PWRCTX_MAXCNT Matt Roper
2022-01-10 11:06 ` Jani Nikula
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 3/7] drm/i915: Parameterize ECOSKPD Matt Roper
2022-01-10 11:10 ` Jani Nikula
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 4/7] drm/i915: Use RING_PSMI_CTL rather than per-engine macros Matt Roper
2022-01-10 11:14 ` Jani Nikula
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 5/7] drm/i915: Replace GFX_MODE_GEN7 with RING_MODE_GEN7 Matt Roper
2022-01-10 11:15 ` Jani Nikula
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 6/7] drm/i915/gt: Move engine registers to their own header Matt Roper
2022-01-10 10:59 ` Jani Nikula
2022-01-08 4:40 ` [Intel-gfx] [PATCH v2 7/7] drm/i915: Move SNPS PHY " Matt Roper
2022-01-10 11:02 ` Jani Nikula
2022-01-10 11:03 ` Jani Nikula
2022-01-08 5:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Start cleaning up register definitions (rev2) Patchwork
2022-01-08 5:13 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-08 5:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-01-08 7:00 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=87czkzalbg.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
/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