Commit 769f0dab authored by Chris Wilson's avatar Chris Wilson

drm/i915: Make workaround verification *optional*

Sometimes the HW doesn't even play fair, and completely forgets about
register writes. Skip verifying known troublemakers.

References: https://bugs.freedesktop.org/show_bug.cgi?id=108954Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190417075657.19456-4-chris@chris-wilson.co.uk
parent 254e1186
...@@ -122,6 +122,7 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa) ...@@ -122,6 +122,7 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)
wal->wa_count++; wal->wa_count++;
wa_->val |= wa->val; wa_->val |= wa->val;
wa_->mask |= wa->mask; wa_->mask |= wa->mask;
wa_->read |= wa->read;
return; return;
} }
} }
...@@ -148,7 +149,8 @@ wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask, ...@@ -148,7 +149,8 @@ wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
struct i915_wa wa = { struct i915_wa wa = {
.reg = reg, .reg = reg,
.mask = mask, .mask = mask,
.val = val .val = val,
.read = mask,
}; };
_wa_add(wal, &wa); _wa_add(wal, &wa);
...@@ -172,6 +174,19 @@ wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 val) ...@@ -172,6 +174,19 @@ wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
wa_write_masked_or(wal, reg, val, val); wa_write_masked_or(wal, reg, val, val);
} }
static void
ignore_wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask, u32 val)
{
struct i915_wa wa = {
.reg = reg,
.mask = mask,
.val = val,
/* Bonkers HW, skip verifying */
};
_wa_add(wal, &wa);
}
#define WA_SET_BIT_MASKED(addr, mask) \ #define WA_SET_BIT_MASKED(addr, mask) \
wa_write_masked_or(wal, (addr), (mask), _MASKED_BIT_ENABLE(mask)) wa_write_masked_or(wal, (addr), (mask), _MASKED_BIT_ENABLE(mask))
...@@ -916,10 +931,11 @@ wal_get_fw_for_rmw(struct intel_uncore *uncore, const struct i915_wa_list *wal) ...@@ -916,10 +931,11 @@ wal_get_fw_for_rmw(struct intel_uncore *uncore, const struct i915_wa_list *wal)
static bool static bool
wa_verify(const struct i915_wa *wa, u32 cur, const char *name, const char *from) wa_verify(const struct i915_wa *wa, u32 cur, const char *name, const char *from)
{ {
if ((cur ^ wa->val) & wa->mask) { if ((cur ^ wa->val) & wa->read) {
DRM_ERROR("%s workaround lost on %s! (%x=%x/%x, expected %x, mask=%x)\n", DRM_ERROR("%s workaround lost on %s! (%x=%x/%x, expected %x, mask=%x)\n",
name, from, i915_mmio_reg_offset(wa->reg), cur, name, from, i915_mmio_reg_offset(wa->reg),
cur & wa->mask, wa->val, wa->mask); cur, cur & wa->read,
wa->val, wa->mask);
return false; return false;
} }
...@@ -1122,8 +1138,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) ...@@ -1122,8 +1138,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE); _3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE);
/* WaPipelineFlushCoherentLines:icl */ /* WaPipelineFlushCoherentLines:icl */
wa_write_or(wal, ignore_wa_write_or(wal,
GEN8_L3SQCREG4, GEN8_L3SQCREG4,
GEN8_LQSC_FLUSH_COHERENT_LINES,
GEN8_LQSC_FLUSH_COHERENT_LINES); GEN8_LQSC_FLUSH_COHERENT_LINES);
/* /*
...@@ -1151,8 +1168,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) ...@@ -1151,8 +1168,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
* Wa_1405733216:icl * Wa_1405733216:icl
* Formerly known as WaDisableCleanEvicts * Formerly known as WaDisableCleanEvicts
*/ */
wa_write_or(wal, ignore_wa_write_or(wal,
GEN8_L3SQCREG4, GEN8_L3SQCREG4,
GEN11_LQSC_CLEAN_EVICT_DISABLE,
GEN11_LQSC_CLEAN_EVICT_DISABLE); GEN11_LQSC_CLEAN_EVICT_DISABLE);
/* WaForwardProgressSoftReset:icl */ /* WaForwardProgressSoftReset:icl */
......
...@@ -15,6 +15,7 @@ struct i915_wa { ...@@ -15,6 +15,7 @@ struct i915_wa {
i915_reg_t reg; i915_reg_t reg;
u32 mask; u32 mask;
u32 val; u32 val;
u32 read;
}; };
struct i915_wa_list { struct i915_wa_list {
......
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