Commit 61b3b0d1 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Chris Wilson

drm/i915/gt: stop ignoring read with wa_masked_field_set

When using masked registers, there is nothing to clear since a masked
register has the mask in the upper 16b: we can just write to the
location we want and use the mask to control what bits we are writing
to.

However that doesn't mean we don't want to read back the register and
check the value actually matched what we wanted to write, i.e. that
the WA stick. That should be an explicit opt-out for registers that are
either write-only or that are affected by hardware misbehavior.

Moreover both wa_masked_en() and wa_masked_dis() check the WA stick, so
skipping the check just because the field is more than 1 bit is
surprising and error-prone.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20201209045246.2905675-1-lucas.demarchi@intel.com
parent e9f4829f
...@@ -233,7 +233,7 @@ static void ...@@ -233,7 +233,7 @@ static void
wa_masked_field_set(struct i915_wa_list *wal, i915_reg_t reg, wa_masked_field_set(struct i915_wa_list *wal, i915_reg_t reg,
u32 mask, u32 val) u32 mask, u32 val)
{ {
wa_write_masked_or(wal, reg, 0, _MASKED_FIELD(mask, val)); wa_add(wal, reg, 0, _MASKED_FIELD(mask, val), mask);
} }
static void gen6_ctx_workarounds_init(struct intel_engine_cs *engine, static void gen6_ctx_workarounds_init(struct intel_engine_cs *engine,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment