On Fri, Sep 25, 2015 at 08:47:11PM +0300, Ville Syrjälä wrote: > On Fri, Sep 25, 2015 at 02:33:37PM +0100, Arun Siluvery wrote: > > Merge Wa4x4STCOptimizationDisable and WaDisablePartialResolveInVc to save > > an entry in WA array. > > > > Signed-off-by: Arun Siluvery <arun.siluvery@xxxxxxxxxxxxxxx> > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Queued for -next, thanks for the patch. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > > index 6671800..ad16ef4 100644 > > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > > @@ -946,10 +946,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) > > } > > > > /* Wa4x4STCOptimizationDisable:skl,bxt */ > > - WA_SET_BIT_MASKED(CACHE_MODE_1, GEN8_4x4_STC_OPTIMIZATION_DISABLE); > > - > > /* WaDisablePartialResolveInVc:skl,bxt */ > > - WA_SET_BIT_MASKED(CACHE_MODE_1, GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE); > > + WA_SET_BIT_MASKED(CACHE_MODE_1, (GEN8_4x4_STC_OPTIMIZATION_DISABLE | > > + GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE)); > > > > /* WaCcsTlbPrefetchDisable:skl,bxt */ > > WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5, > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
