<div dir="ltr">Oh just noticed we duplicated effort on this.. [5/5] drm/i915/bdw: Remove BDW preproduction W/As until C stepping.<div><br><div><div>After this land -nightly I rebase my series on top.</div></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 24, 2014 at 1:41 AM, Daniel Vetter <span dir="ltr"><<a href="mailto:daniel@ffwll.ch" target="_blank">daniel@ffwll.ch</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Tue, Sep 23, 2014 at 02:48:47PM +0300, Jani Nikula wrote:<br> > On Tue, 23 Sep 2014, Daniel Vetter <<a href="mailto:daniel@ffwll.ch">daniel@ffwll.ch</a>> wrote:<br> > > On Fri, Sep 19, 2014 at 08:49:06PM +0300, Ville Syrjälä wrote:<br> > >> On Fri, Sep 19, 2014 at 08:05:26PM +0300, Mika Kuoppala wrote:<br> > >> > as these have been fixed in production hw and hurt performance<br> > >> > if applied.<br> > >> ><br> > >> > v2: adjust requested ring space (Ville)<br> > >> ><br> > >> > Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=83482" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=83482</a><br> > >> > Tested-by: zhoujian <<a href="mailto:jianx.zhou@intel.com">jianx.zhou@intel.com</a>><br> > >> > Signed-off-by: Mika Kuoppala <<a href="mailto:mika.kuoppala@intel.com">mika.kuoppala@intel.com</a>><br> > >><br> > >> Documentation agrees that these can go.<br> > >> Reviewed-by: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a>><br> > ><br> > > Cc: <a href="mailto:stable@vger.kernel.org">stable@vger.kernel.org</a> imo. Jani?<br> ><br> > This depends on<br> ><br> > commit 86d7f23842f1bce3ab5e8c8d0c676112bbc4c99b<br> > Author: Arun Siluvery <<a href="mailto:arun.siluvery@linux.intel.com">arun.siluvery@linux.intel.com</a>><br> > Date: Tue Aug 26 14:44:50 2014 +0100<br> ><br> > drm/i915/bdw: Apply workarounds in render ring init function<br> ><br> > which brought the problem to daylight to begin with. That's not in<br> > 3.17-rc6. I'm not sure if that one has additional dependencies, but<br> > perhaps a combined backport without an intermediate broken step is<br> > plausible.<br> ><br> > In any case I don't think this is something we want to rush for 3.17<br> > now, since a release is imminent, so it'll be 3.18. Adding cc: stable is<br> > up to you, but do note the size is beyond stable rules.<br> <br> </div></div>Hm right, so a patch for drm-intel-next-fixes (first one even!). I'll<br> leave out the cc: stable since backporting all the register wa stuff is a<br> pile of patches ...<br> <span class="HOEnZb"><font color="#888888">-Daniel<br> </font></span><div class="HOEnZb"><div class="h5"><br> ><br> ><br> > BR,<br> > Jani.<br> ><br> ><br> ><br> > > -Daniel<br> > ><br> > >><br> > >> > ---<br> > >> > drivers/gpu/drm/i915/intel_ringbuffer.c | 15 ++-------------<br> > >> > 1 file changed, 2 insertions(+), 13 deletions(-)<br> > >> ><br> > >> > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c<br> > >> > index 681ea86..679a3c7 100644<br> > >> > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c<br> > >> > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c<br> > >> > @@ -707,7 +707,7 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring)<br> > >> > * update the number of dwords required based on the<br> > >> > * actual number of workarounds applied<br> > >> > */<br> > >> > - ret = intel_ring_begin(ring, 24);<br> > >> > + ret = intel_ring_begin(ring, 18);<br> > >> > if (ret)<br> > >> > return ret;<br> > >> ><br> > >> > @@ -722,19 +722,8 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring)<br> > >> > intel_ring_emit_wa(ring, GEN7_ROW_CHICKEN2,<br> > >> > _MASKED_BIT_ENABLE(DOP_CLOCK_GATING_DISABLE));<br> > >> ><br> > >> > - /*<br> > >> > - * This GEN8_CENTROID_PIXEL_OPT_DIS W/A is only needed for<br> > >> > - * pre-production hardware<br> > >> > - */<br> > >> > intel_ring_emit_wa(ring, HALF_SLICE_CHICKEN3,<br> > >> > - _MASKED_BIT_ENABLE(GEN8_CENTROID_PIXEL_OPT_DIS<br> > >> > - | GEN8_SAMPLER_POWER_BYPASS_DIS));<br> > >> > -<br> > >> > - intel_ring_emit_wa(ring, GEN7_HALF_SLICE_CHICKEN1,<br> > >> > - _MASKED_BIT_ENABLE(GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE));<br> > >> > -<br> > >> > - intel_ring_emit_wa(ring, COMMON_SLICE_CHICKEN2,<br> > >> > - _MASKED_BIT_ENABLE(GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE));<br> > >> > + _MASKED_BIT_ENABLE(GEN8_SAMPLER_POWER_BYPASS_DIS));<br> > >> ><br> > >> > /* Use Force Non-Coherent whenever executing a 3D context. This is a<br> > >> > * workaround for for a possible hang in the unlikely event a TLB<br> > >> > --<br> > >> > 1.9.1<br> > >><br> > >> --<br> > >> Ville Syrjälä<br> > >> Intel OTC<br> > >> _______________________________________________<br> > >> Intel-gfx mailing list<br> > >> <a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br> > >> <a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br> > ><br> > > --<br> > > Daniel Vetter<br> > > Software Engineer, Intel Corporation<br> > > <a href="tel:%2B41%20%280%29%2079%20365%2057%2048" value="+41793655748">+41 (0) 79 365 57 48</a> - <a href="http://blog.ffwll.ch" target="_blank">http://blog.ffwll.ch</a><br> ><br> > --<br> > Jani Nikula, Intel Open Source Technology Center<br> <br> --<br> Daniel Vetter<br> Software Engineer, Intel Corporation<br> <a href="tel:%2B41%20%280%29%2079%20365%2057%2048" value="+41793655748">+41 (0) 79 365 57 48</a> - <a href="http://blog.ffwll.ch" target="_blank">http://blog.ffwll.ch</a><br> _______________________________________________<br> Intel-gfx mailing list<br> <a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br> <a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br> </div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div> </div>