Sorry for top-posting, but why is this email on mesa-dev, and not on intel-gfx? I mean, the latter is for the kernel driver while the former is the userspace 3d driver, so intel-gfx@xxxxxxxxxxxxxxxxxxxxx is definitely the prefered mailing list for these discussions. Martin On 21/05/18 14:11, Greg Kroah-Hartman wrote: > 4.16-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Michel Thierry <michel.thierry@xxxxxxxxx> > > commit b579f924a90f42fa561afd8201514fc216b71949 upstream. > > Factor in clear values wherever required while updating destination > min/max. > > References: HSDES#1604444184 > Signed-off-by: Michel Thierry <michel.thierry@xxxxxxxxx> > Cc: mesa-dev@xxxxxxxxxxxxxxxxxxxxx > Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > Cc: Oscar Mateo <oscar.mateo@xxxxxxxxx> > Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Link: https://patchwork.freedesktop.org/patch/msgid/20180510200708.18097-1-michel.thierry@xxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Link: https://patchwork.freedesktop.org/patch/msgid/20180514165445.9198-1-michel.thierry@xxxxxxxxx > (backported from commit 0c79f9cb77eae28d48a4f9fc1b3341aacbbd260c) > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/gpu/drm/i915/i915_reg.h | 3 +++ > drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ > 2 files changed, 7 insertions(+) > > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -7139,6 +7139,9 @@ enum { > #define SLICE_ECO_CHICKEN0 _MMIO(0x7308) > #define PIXEL_MASK_CAMMING_DISABLE (1 << 14) > > +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) > +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) > + > /* WaCatErrorRejectionIssue */ > #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030) > #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) > --- a/drivers/gpu/drm/i915/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > @@ -1098,6 +1098,10 @@ static int gen9_init_workarounds(struct > WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1, GEN9_PREEMPT_GPGPU_LEVEL_MASK, > GEN9_PREEMPT_GPGPU_COMMAND_LEVEL); > > + /* WaClearHIZ_WM_CHICKEN3:bxt,glk */ > + if (IS_GEN9_LP(dev_priv)) > + WA_SET_BIT_MASKED(GEN9_WM_CHICKEN3, GEN9_FACTOR_IN_CLR_VAL_HIZ); > + > /* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ > ret = wa_ring_whitelist_reg(engine, GEN9_CTX_PREEMPT_REG); > if (ret) > > > _______________________________________________ > mesa-dev mailing list > mesa-dev@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
