| Message ID | 20210413051002.92589-7-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Extend GEN renames to the rest of the driver | expand |
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));
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));
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(-)