On Thu, Feb 05, 2015 at 10:47:23AM +0000, Nick Hoath wrote: > From: "Hoath, Nicholas" <nicholas.hoath@xxxxxxxxx> > > Move Wa4x4STCOptimizationDisable to gen9_init_workarounds > > v1: rebase > > Signed-off-by: Nick Hoath <nicholas.hoath@xxxxxxxxx> Reviewed-by: Damien Lespiau <damien.lespiau@xxxxxxxxx> -- Damien > --- > drivers/gpu/drm/i915/intel_pm.c | 4 ---- > drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 06d67fd..30071ff 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -64,10 +64,6 @@ static void gen9_init_clock_gating(struct drm_device *dev) > I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) | > GEN8_SDEUNIT_CLOCK_GATE_DISABLE); > } > - > - /* Wa4x4STCOptimizationDisable:skl */ > - I915_WRITE(CACHE_MODE_1, > - _MASKED_BIT_ENABLE(GEN8_4x4_STC_OPTIMIZATION_DISABLE)); > } > > static void i915_pineview_get_mem_freq(struct drm_device *dev) > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 884f319..066b63d 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -902,6 +902,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) > GEN9_ENABLE_YV12_BUGFIX); > } > > + /* Wa4x4STCOptimizationDisable:skl */ > + WA_SET_BIT_MASKED(CACHE_MODE_1, GEN8_4x4_STC_OPTIMIZATION_DISABLE); > + > return 0; > } > > -- > 2.1.1 > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
