| Message ID | 1470127013-29653-1-git-send-email-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/08/2016 09:36, Matthew Auld wrote: > As pointed out by Chris Harris, we are using the wrong WA name, it > should in fact be WaToEnableHwFixForPushConstHWBug, also it should be > applied from C0 onwards for both BXT and KBL. > > Fixes: 7b9005cd45f3 ("drm/i915: Add WaInsertDummyPushConstP for bxt and kbl") > > Cc: Chris Harris <chris.harris@intel.com> > Cc: Mika Kuoppala <mika.kuoppala@intel.com> > Reported-by: Chris Harris <chris.harris@intel.com> > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 15acaf6..0df7381 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -1173,8 +1173,8 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine) > I915_WRITE(GEN8_L3SQCREG1, L3_GENERAL_PRIO_CREDITS(62) | > L3_HIGH_PRIO_CREDITS(2)); > > - /* WaInsertDummyPushConstPs:bxt */ > - if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0)) > + /* WaToEnableHwFixForPushConstHWBug:bxt */ > + if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER)) > WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2, > GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION); > > @@ -1217,8 +1217,8 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine) > I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) | > GEN8_LQSC_RO_PERF_DIS); > > - /* WaInsertDummyPushConstPs:kbl */ > - if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0)) > + /* WaToEnableHwFixForPushConstHWBug:kbl */ > + if (IS_KBL_REVID(dev_priv, KBL_REVID_C0, REVID_FOREVER)) > WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2, > GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION); > > Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com> regards Arun
> Test kms_cursor_legacy: > Subgroup basic-cursor-vs-flip-legacy: > fail -> PASS (ro-ilk1-i5-650) > Subgroup basic-flip-vs-cursor-legacy: > pass -> FAIL (ro-snb-i7-2620M) > pass -> FAIL (ro-bdw-i5-5250u) https://bugs.freedesktop.org/show_bug.cgi?id=97188 > Test kms_pipe_crc_basic: > Subgroup suspend-read-crc-pipe-a: > pass -> DMESG-WARN (ro-bdw-i7-5557U) https://bugs.freedesktop.org/show_bug.cgi?id=96913
On pe, 2016-08-05 at 10:56 +0100, Matthew Auld wrote: > > > > Test kms_cursor_legacy: > > Subgroup basic-cursor-vs-flip-legacy: > > fail -> PASS (ro-ilk1-i5-650) > > Subgroup basic-flip-vs-cursor-legacy: > > pass -> FAIL (ro-snb-i7-2620M) > > pass -> FAIL (ro-bdw-i5-5250u) > https://bugs.freedesktop.org/show_bug.cgi?id=97188 > > > > > Test kms_pipe_crc_basic: > > Subgroup suspend-read-crc-pipe-a: > > pass -> DMESG-WARN (ro-bdw-i7-5557U) > https://bugs.freedesktop.org/show_bug.cgi?id=96913 Patch merged, thanks for the patch and review. Regards, Joonas
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 15acaf6..0df7381 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1173,8 +1173,8 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine) I915_WRITE(GEN8_L3SQCREG1, L3_GENERAL_PRIO_CREDITS(62) | L3_HIGH_PRIO_CREDITS(2)); - /* WaInsertDummyPushConstPs:bxt */ - if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0)) + /* WaToEnableHwFixForPushConstHWBug:bxt */ + if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER)) WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2, GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION); @@ -1217,8 +1217,8 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine) I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) | GEN8_LQSC_RO_PERF_DIS); - /* WaInsertDummyPushConstPs:kbl */ - if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_B0)) + /* WaToEnableHwFixForPushConstHWBug:kbl */ + if (IS_KBL_REVID(dev_priv, KBL_REVID_C0, REVID_FOREVER)) WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2, GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
As pointed out by Chris Harris, we are using the wrong WA name, it should in fact be WaToEnableHwFixForPushConstHWBug, also it should be applied from C0 onwards for both BXT and KBL. Fixes: 7b9005cd45f3 ("drm/i915: Add WaInsertDummyPushConstP for bxt and kbl") Cc: Chris Harris <chris.harris@intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Reported-by: Chris Harris <chris.harris@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)