From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 06/12] drm/i915/selftests: replace unused mask with simple version
Date: Tue, 13 Apr 2021 12:36:49 +0300 [thread overview]
Message-ID: <87tuoah6fi.fsf@intel.com> (raw)
In-Reply-To: <20210413051002.92589-7-lucas.demarchi@intel.com>
On Mon, 12 Apr 2021, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Since its introduction 2 years ago, we never used the mask to span more
> than one gen. Replace gen_mask a single number and start using the new
> GRAPHICS_VER().
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/gt/selftest_workarounds.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> index 19850489a3fc..64937ec3f2dc 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
> @@ -927,7 +927,7 @@ static int scrub_whitelisted_registers(struct intel_context *ce)
>
> struct regmask {
> i915_reg_t reg;
> - unsigned long gen_mask;
> + u8 graphics_ver;
> };
>
> static bool find_reg(struct drm_i915_private *i915,
> @@ -938,7 +938,7 @@ static bool find_reg(struct drm_i915_private *i915,
> u32 offset = i915_mmio_reg_offset(reg);
>
> while (count--) {
> - if (INTEL_INFO(i915)->gen_mask & tbl->gen_mask &&
> + if (GRAPHICS_VER(i915) == tbl->graphics_ver &&
> i915_mmio_reg_offset(tbl->reg) == offset)
> return true;
> tbl++;
> @@ -951,8 +951,8 @@ static bool pardon_reg(struct drm_i915_private *i915, i915_reg_t reg)
> {
> /* Alas, we must pardon some whitelists. Mistakes already made */
> static const struct regmask pardon[] = {
> - { GEN9_CTX_PREEMPT_REG, INTEL_GEN_MASK(9, 9) },
> - { GEN8_L3SQCREG4, INTEL_GEN_MASK(9, 9) },
> + { GEN9_CTX_PREEMPT_REG, 9 },
> + { GEN8_L3SQCREG4, 9 },
> };
>
> return find_reg(i915, reg, pardon, ARRAY_SIZE(pardon));
> @@ -974,7 +974,7 @@ static bool writeonly_reg(struct drm_i915_private *i915, i915_reg_t reg)
> {
> /* Some registers do not seem to behave and our writes unreadable */
> static const struct regmask wo[] = {
> - { GEN9_SLICE_COMMON_ECO_CHICKEN1, INTEL_GEN_MASK(9, 9) },
> + { GEN9_SLICE_COMMON_ECO_CHICKEN1, 9 },
> };
>
> return find_reg(i915, reg, wo, ARRAY_SIZE(wo));
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-04-13 9:36 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 5:09 [Intel-gfx] [PATCH v2 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 01/12] drm/i915/display: use DISPLAY_VER() on remaining users Lucas De Marchi
2021-04-13 9:24 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 02/12] drm/i915: rename display.version to display.ver Lucas De Marchi
2021-04-13 9:25 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 03/12] drm/i915/display: rename display version macros Lucas De Marchi
2021-04-13 9:35 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 04/12] drm/i915: add macros for graphics and media versions Lucas De Marchi
2021-04-13 9:33 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 05/12] drm/i915/gt: replace gen use in intel_engine_cs Lucas De Marchi
2021-04-13 9:36 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 06/12] drm/i915/selftests: replace unused mask with simple version Lucas De Marchi
2021-04-13 9:36 ` Jani Nikula [this message]
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 07/12] drm/i915/selftests: eliminate use of gen_mask Lucas De Marchi
2021-04-13 9:38 ` Jani Nikula
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 08/12] drm/i915: finish removal " Lucas De Marchi
2021-04-13 9:40 ` Jani Nikula
2021-04-14 11:38 ` Tvrtko Ursulin
2021-04-14 13:13 ` Jani Nikula
2021-04-14 13:46 ` Tvrtko Ursulin
2021-04-15 10:22 ` Jani Nikula
2021-04-14 17:41 ` Lucas De Marchi
2021-04-13 5:09 ` [Intel-gfx] [PATCH v2 09/12] drm/i915: eliminate remaining uses of intel_device_info->gen Lucas De Marchi
2021-04-13 9:43 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 10/12] drm/i915: finish removal of gen from intel_device_info Lucas De Marchi
2021-04-13 9:45 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 11/12] drm/i915: add media and display versions to device_info print Lucas De Marchi
2021-04-13 9:46 ` Jani Nikula
2021-04-13 5:10 ` [Intel-gfx] [PATCH v2 12/12] drm/i915: split dgfx features from gen 12 Lucas De Marchi
2021-04-13 9:47 ` Jani Nikula
2021-04-13 5:43 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Extend GEN renames to the rest of the driver (rev3) Patchwork
2021-04-13 5:45 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-04-13 5:48 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-04-13 6:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-04-13 7:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-04-13 10:03 ` [Intel-gfx] [PATCH v2 00/12] drm/i915: Extend GEN renames to the rest of the driver Jani Nikula
2021-04-14 8:08 ` Jani Nikula
2021-04-14 10:06 ` Jani Nikula
2021-04-14 11:17 ` Joonas Lahtinen
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=87tuoah6fi.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.