From: "Yokoyama, Caz" <caz.yokoyama@intel.com>
To: "Roper, Matthew D" <matthew.d.roper@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915/xehp: Xe_HP shadowed registers are a strict superset of gen12
Date: Thu, 29 Jul 2021 23:36:55 +0000 [thread overview]
Message-ID: <efb403e90b16ccf689bb636db9029985042d7540.camel@intel.com> (raw)
In-Reply-To: <20210729054118.2458523-7-matthew.d.roper@intel.com>
Reviewed-by: az Yokoyama <caz.yokoyama@intel.com>
-caz
On Wed, 2021-07-28 at 22:41 -0700, Matt Roper wrote:
> The list of shadowed registers on XeHP is identical to the set for
> earlier gen12 platforms, with additional ranges added for the new VCS
> and VECS engines. Since those register ranges were reserved on
> earlier
> gen12 platforms, it's safe to consolidate to a single gen12 table
> rather than tracking Xe_HP separately.
>
> Bspec: 52077
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 50 +++++----------
> ----
> drivers/gpu/drm/i915/selftests/intel_uncore.c | 1 -
> 2 files changed, 12 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c
> b/drivers/gpu/drm/i915/intel_uncore.c
> index 42acf106a6df..4abe9df5fb76 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1006,39 +1006,24 @@ static const struct i915_range
> gen12_shadowed_regs[] = {
> { .start = 0x1D4510, .end = 0x1D4550 },
> { .start = 0x1D8030, .end = 0x1D8030 },
> { .start = 0x1D8510, .end = 0x1D8550 },
> -};
>
> -static const struct i915_range xehp_shadowed_regs[] = {
> - { .start = 0x2000, .end = 0x2030 },
> - { .start = 0x2550, .end = 0x2550 },
> - { .start = 0xA008, .end = 0xA00C },
> - { .start = 0x22030, .end = 0x22030 },
> - { .start = 0x22550, .end = 0x22550 },
> - { .start = 0x1C0030, .end = 0x1C0030 },
> - { .start = 0x1C0550, .end = 0x1C0550 },
> - { .start = 0x1C4030, .end = 0x1C4030 },
> - { .start = 0x1C4550, .end = 0x1C4550 },
> - { .start = 0x1C8030, .end = 0x1C8030 },
> - { .start = 0x1C8550, .end = 0x1C8550 },
> - { .start = 0x1D0030, .end = 0x1D0030 },
> - { .start = 0x1D0550, .end = 0x1D0550 },
> - { .start = 0x1D4030, .end = 0x1D4030 },
> - { .start = 0x1D4550, .end = 0x1D4550 },
> - { .start = 0x1D8030, .end = 0x1D8030 },
> - { .start = 0x1D8550, .end = 0x1D8550 },
> + /*
> + * The rest of these ranges are specific to Xe_HP and beyond,
> but
> + * are reserved/unused ranges on earlier gen12 platforms, so
> they can
> + * be safely added to the gen12 table.
> + */
> { .start = 0x1E0030, .end = 0x1E0030 },
> - { .start = 0x1E0550, .end = 0x1E0550 },
> + { .start = 0x1E0510, .end = 0x1E0550 },
> { .start = 0x1E4030, .end = 0x1E4030 },
> - { .start = 0x1E4550, .end = 0x1E4550 },
> + { .start = 0x1E4510, .end = 0x1E4550 },
> { .start = 0x1E8030, .end = 0x1E8030 },
> - { .start = 0x1E8550, .end = 0x1E8550 },
> + { .start = 0x1E8510, .end = 0x1E8550 },
> { .start = 0x1F0030, .end = 0x1F0030 },
> - { .start = 0x1F0550, .end = 0x1F0550 },
> + { .start = 0x1F0510, .end = 0x1F0550 },
> { .start = 0x1F4030, .end = 0x1F4030 },
> - { .start = 0x1F4550, .end = 0x1F4550 },
> + { .start = 0x1F4510, .end = 0x1F4550 },
> { .start = 0x1F8030, .end = 0x1F8030 },
> - { .start = 0x1F8550, .end = 0x1F8550 },
> - /* TODO: Other registers are not yet used */
> + { .start = 0x1F8510, .end = 0x1F8550 },
> };
>
> static int mmio_range_cmp(u32 key, const struct i915_range *range)
> @@ -1062,7 +1047,6 @@ static bool is_##x##_shadowed(u32 offset) \
> __is_X_shadowed(gen8)
> __is_X_shadowed(gen11)
> __is_X_shadowed(gen12)
> -__is_X_shadowed(xehp)
>
> static enum forcewake_domains
> gen6_reg_write_fw_domains(struct intel_uncore *uncore, i915_reg_t
> reg)
> @@ -1126,15 +1110,6 @@ static const struct intel_forcewake_range
> __chv_fw_ranges[] = {
> __fwd; \
> })
>
> -#define __xehp_fwtable_reg_write_fw_domains(uncore, offset) \
> -({ \
> - enum forcewake_domains __fwd = 0; \
> - const u32 __offset = (offset); \
> - if (!is_xehp_shadowed(__offset)) \
> - __fwd = find_fw_domain(uncore, __offset); \
> - __fwd; \
> -})
> -
> /* *Must* be sorted by offset ranges! See intel_fw_table_check(). */
> static const struct intel_forcewake_range __gen9_fw_ranges[] = {
> GEN_FW_RANGE(0x0, 0xaff, FORCEWAKE_GT),
> @@ -1710,7 +1685,6 @@ __gen_write(func, 8) \
> __gen_write(func, 16) \
> __gen_write(func, 32)
>
> -__gen_reg_write_funcs(xehp_fwtable);
> __gen_reg_write_funcs(gen12_fwtable);
> __gen_reg_write_funcs(gen11_fwtable);
> __gen_reg_write_funcs(fwtable);
> @@ -2087,7 +2061,7 @@ static int uncore_forcewake_init(struct
> intel_uncore *uncore)
>
> if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) {
> ASSIGN_FW_DOMAINS_TABLE(uncore, __xehp_fw_ranges);
> - ASSIGN_WRITE_MMIO_VFUNCS(uncore, xehp_fwtable);
> + ASSIGN_WRITE_MMIO_VFUNCS(uncore, gen12_fwtable);
> ASSIGN_READ_MMIO_VFUNCS(uncore, gen11_fwtable);
> } else if (GRAPHICS_VER(i915) >= 12) {
> ASSIGN_FW_DOMAINS_TABLE(uncore, __gen12_fw_ranges);
> diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c
> b/drivers/gpu/drm/i915/selftests/intel_uncore.c
> index d3e36ed32646..63b75585865f 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c
> @@ -68,7 +68,6 @@ static int intel_shadow_table_check(void)
> { gen8_shadowed_regs, ARRAY_SIZE(gen8_shadowed_regs) },
> { gen11_shadowed_regs, ARRAY_SIZE(gen11_shadowed_regs)
> },
> { gen12_shadowed_regs, ARRAY_SIZE(gen12_shadowed_regs)
> },
> - { xehp_shadowed_regs, ARRAY_SIZE(xehp_shadowed_regs) },
> };
> const struct i915_range *range;
> unsigned int i, j;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-29 23:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 5:41 [Intel-gfx] [PATCH 0/6] Forcewake and shadowed register updates Matt Roper
2021-07-29 5:41 ` [Intel-gfx] [PATCH 1/6] drm/i915: correct name of GT forcewake domain in error messages Matt Roper
2021-07-29 14:13 ` Yokoyama, Caz
2021-07-29 5:41 ` [Intel-gfx] [PATCH 2/6] drm/i915: Re-use gen11 forcewake read functions on gen12 Matt Roper
2021-07-29 21:02 ` Yokoyama, Caz
2021-07-29 5:41 ` [Intel-gfx] [PATCH 3/6] drm/i915: Make shadow tables range-based Matt Roper
2021-07-29 15:21 ` [Intel-gfx] [PATCH v2 " Matt Roper
2021-07-29 21:55 ` Yokoyama, Caz
2021-07-29 21:59 ` Matt Roper
2021-08-10 22:02 ` Yokoyama, Caz
2021-07-29 5:41 ` [Intel-gfx] [PATCH 4/6] drm/i915/gen11: Update shadowed register table Matt Roper
2021-08-10 22:03 ` Yokoyama, Caz
2021-07-29 5:41 ` [Intel-gfx] [PATCH 5/6] drm/i915/gen12: " Matt Roper
2021-08-10 22:04 ` Yokoyama, Caz
2021-07-29 5:41 ` [Intel-gfx] [PATCH 6/6] drm/i915/xehp: Xe_HP shadowed registers are a strict superset of gen12 Matt Roper
2021-07-29 23:36 ` Yokoyama, Caz [this message]
2021-07-29 6:09 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Forcewake and shadowed register updates Patchwork
2021-07-29 6:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-29 13:00 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-07-29 20:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Forcewake and shadowed register updates (rev2) Patchwork
2021-07-29 20:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-30 8:36 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=efb403e90b16ccf689bb636db9029985042d7540.camel@intel.com \
--to=caz.yokoyama@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;
as well as URLs for NNTP newsgroup(s).