| Message ID | 20190530151622.31066-1-daniele.ceraolospurio@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: remove duplicated WaDisableBankHangMode:icl | expand |
Quoting Daniele Ceraolo Spurio (2019-05-30 16:16:21)
> Accidentally added during the merge of drm-next.
It's a dim issue. A dinq patch cherry-picked into dif that git isn't
eliminating the duplication when dim build tips.
https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#resolving-conflicts-when-rebuilding-drm-tip
See "Fixing Silent Conflicts"
Note already fixed up.
-Chris
Hi, > -----Original Message----- > From: Chris Wilson [mailto:chris@chris-wilson.co.uk] > Sent: torstai 30. toukokuuta 2019 18.23 > To: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; Saarinen, Jani > <jani.saarinen@intel.com> > Subject: Re: [PATCH] drm/i915: remove duplicated WaDisableBankHangMode:icl > > Quoting Daniele Ceraolo Spurio (2019-05-30 16:16:21) > > Accidentally added during the merge of drm-next. > > It's a dim issue. A dinq patch cherry-picked into dif that git isn't eliminating the > duplication when dim build tips. > https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#resolving- > conflicts-when-rebuilding-drm-tip > See "Fixing Silent Conflicts" > > Note already fixed up. When this can be seen also in CI? > -Chris
Quoting Saarinen, Jani (2019-05-31 07:20:10) > Hi, > > > -----Original Message----- > > From: Chris Wilson [mailto:chris@chris-wilson.co.uk] > > Sent: torstai 30. toukokuuta 2019 18.23 > > To: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; intel- > > gfx@lists.freedesktop.org > > Cc: Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; Saarinen, Jani > > <jani.saarinen@intel.com> > > Subject: Re: [PATCH] drm/i915: remove duplicated WaDisableBankHangMode:icl > > > > Quoting Daniele Ceraolo Spurio (2019-05-30 16:16:21) > > > Accidentally added during the merge of drm-next. > > > > It's a dim issue. A dinq patch cherry-picked into dif that git isn't eliminating the > > duplication when dim build tips. > > https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#resolving- > > conflicts-when-rebuilding-drm-tip > > See "Fixing Silent Conflicts" > > > > Note already fixed up. > When this can be seen also in CI? When somebody restarts CI. -Chris
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index dcfa6ca09f7b..133d069244f4 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -530,12 +530,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,
Accidentally added during the merge of drm-next. Fixes: 7126b65091c4 ("Merge remote-tracking branch 'drm/drm-next' into drm-tip") Reported-by: Jani Saarinen <jani.saarinen@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 ------ 1 file changed, 6 deletions(-)