All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 04/12] drm/i915/selftests: replace unused mask with simple version
Date: Wed,  7 Apr 2021 17:41:52 -0700	[thread overview]
Message-ID: <20210408004200.984176-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20210408004200.984176-1-lucas.demarchi@intel.com>

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>
---
 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));
-- 
2.31.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2021-04-08  0:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08  0:41 [Intel-gfx] [PATCH 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 01/12] drm/i915: rename display.version to display.ver Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 02/12] drm/i915: add macros for graphics and media versions Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 03/12] drm/i915/gt: replace gen use in intel_engine_cs Lucas De Marchi
2021-04-08  0:41 ` Lucas De Marchi [this message]
2021-04-08  0:41 ` [Intel-gfx] [PATCH 05/12] drm/i915/selftests: eliminate use of gen_mask Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 06/12] drm/i915: finish removal " Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 07/12] drm/i915: eliminate remaining uses of intel_device_info->gen Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 08/12] drm/i915: finish removal of gen from intel_device_info Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 09/12] drm/i915: add media and display versions to device_info print Lucas De Marchi
2021-04-08  0:41 ` [Intel-gfx] [PATCH 10/12] drm/i915/display: use DISPLAY_VER() on remaining users Lucas De Marchi
2021-04-08  0:42 ` [Intel-gfx] [PATCH 12/12] drm/i915: split dgfx features from gen 12 Lucas De Marchi
2021-04-08  4:41 ` [Intel-gfx] [PATCH 00/12] drm/i915: Extend GEN renames to the rest of the driver Lucas De Marchi
2021-04-08  4:52 Lucas De Marchi
2021-04-08  4:52 ` [Intel-gfx] [PATCH 04/12] drm/i915/selftests: replace unused mask with simple version Lucas De Marchi

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=20210408004200.984176-5-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=intel-gfx@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 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.