From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/5] drm/i915/bdw: WaDisableFenceDestinationToSLM Date: Mon, 29 Sep 2014 14:32:18 +0200 Message-ID: <20140929123218.GI4109@phenom.ffwll.local> References: <1411172190-1642-1-git-send-email-rodrigo.vivi@intel.com> <1411172190-1642-2-git-send-email-rodrigo.vivi@intel.com> <874mvvnaem.fsf@gaia.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 8842B89E57 for ; Mon, 29 Sep 2014 05:32:21 -0700 (PDT) Received: by mail-we0-f172.google.com with SMTP id q58so4019152wes.31 for ; Mon, 29 Sep 2014 05:32:20 -0700 (PDT) Content-Disposition: inline In-Reply-To: <874mvvnaem.fsf@gaia.fi.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org On Thu, Sep 25, 2014 at 03:37:37PM +0300, Mika Kuoppala wrote: > Rodrigo Vivi writes: > > > This WA affect BDW GT3 E and F steppings. Thou shalt not mention steppings in public. Fixed here and in the comment below while applying. > > > > Signed-off-by: Rodrigo Vivi > > Reviewed-by: Mika Kuoppala Queued for -next, thanks for the patch. -Daniel > > > --- > > drivers/gpu/drm/i915/i915_reg.h | 1 + > > drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++++- > > 2 files changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index ad8179b..124ea60 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -4836,6 +4836,7 @@ enum punit_power_well { > > /* GEN8 chicken */ > > #define HDC_CHICKEN0 0x7300 > > #define HDC_FORCE_NON_COHERENT (1<<4) > > +#define HDC_FENCE_DEST_SLM_DISABLE (1<<14) > > > > /* WaCatErrorRejectionIssue */ > > #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG 0x9030 > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > > index 681ea86..7c3d17a 100644 > > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > > @@ -740,8 +740,12 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring) > > * workaround for for a possible hang in the unlikely event a TLB > > * invalidation occurs during a PSD flush. > > */ > > + /* WaDisableFenceDestinationToSLM:bdw (GT3 pre-production E/F) */ > > intel_ring_emit_wa(ring, HDC_CHICKEN0, > > - _MASKED_BIT_ENABLE(HDC_FORCE_NON_COHERENT)); > > + _MASKED_BIT_ENABLE(HDC_FORCE_NON_COHERENT | > > + (IS_BDW_GT3(dev) ? > > + HDC_FENCE_DEST_SLM_DISABLE : 0) > > + )); > > > > /* Wa4x4STCOptimizationDisable:bdw */ > > intel_ring_emit_wa(ring, CACHE_MODE_1, > > -- > > 1.9.3 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch