[Intel-gfx] [PATCH 2/6] drm/i915/selftests: Clear flags when using wa->reg for comparison

Umesh Nerlige Ramappa umesh.nerlige.ramappa at intel.com
Thu Jul 30 00:48:22 UTC 2020


The flags field of the wa->reg has whitelist settings as opposed to the
value returned from i915_mmio_reg_offset(reg). Clear the flags before
compare.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
---
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index febc9e6692ba..3753f65f62b1 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -918,6 +918,9 @@ static bool find_reg(struct drm_i915_private *i915,
 {
 	u32 offset = i915_mmio_reg_offset(reg);
 
+	/* Clear non priv flags */
+	offset &= RING_FORCE_TO_NONPRIV_ADDRESS_MASK;
+
 	while (count--) {
 		if (INTEL_INFO(i915)->gen_mask & tbl->gen_mask &&
 		    i915_mmio_reg_offset(tbl->reg) == offset)
-- 
2.20.1



More information about the Intel-gfx mailing list