From: Chris Wilson Date: Wed, 10 Jul 2019 20:04:28 +0000 (+0100) Subject: drm/i915/gt: Drop the duplicate icl workaround X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=47c4bdd6d3ea771f31ab2ef48219d713e808970f;p=openwrt%2Fstaging%2Fblogic.git drm/i915/gt: Drop the duplicate icl workaround The extra w/a was revived in the backmerge that was meant to fix it! Fixes: 88c90e800675 ("Merge drm/drm-next into drm-intel-next-queued") Signed-off-by: Chris Wilson Cc: Rodrigo Vivi Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20190710200428.3275-1-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index f6fd6905ee6f..9e069286d3ce 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -531,12 +531,6 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, { struct drm_i915_private *i915 = engine->i915; - /* WaDisableBankHangMode:icl */ - wa_write(wal, - GEN8_L3CNTLREG, - intel_uncore_read(engine->uncore, GEN8_L3CNTLREG) | - GEN8_ERRDETBCTRL); - /* WaDisableBankHangMode:icl */ wa_write(wal, GEN8_L3CNTLREG,