Commit 3e6e4c21 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Jani Nikula
Browse files

drm/i915/selftests: replace unused mask with simple version 



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().

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-7-lucas.demarchi@intel.com
parent 1b9d8406

drivers/gpu/drm/i915/gt/selftest_workarounds.c

+5 −5
Original line number Diff line number Diff line
@@ -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));