From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE584C433DF for ; Thu, 11 Jun 2020 10:10:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF48120747 for ; Thu, 11 Jun 2020 10:10:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF48120747 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EED86E8DA; Thu, 11 Jun 2020 10:10:09 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 996916E8DA for ; Thu, 11 Jun 2020 10:10:07 +0000 (UTC) IronPort-SDR: nJWkXYrJLhT38EnB2aR3z7lKfjZKgeQgRx0tp+AD0p8L0HTDuw8nSqk9oNY0cW6leaka+PsrQz RVLIWppmnqyA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2020 03:10:07 -0700 IronPort-SDR: 6BKAy9xMIvWnnIUIXhcwxfSEC0Lh5Q7vs7TJkrIaLg1JCQCUqvVGoDrWwrgwgI6unlKH5x7jfI xT98++qTUJkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,499,1583222400"; d="scan'208";a="259569820" Received: from gaia.fi.intel.com ([10.237.72.192]) by fmsmga007.fm.intel.com with ESMTP; 11 Jun 2020 03:10:06 -0700 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id DB88F5C2CA7; Thu, 11 Jun 2020 13:07:30 +0300 (EEST) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20200611080140.30228-6-chris@chris-wilson.co.uk> References: <20200611080140.30228-1-chris@chris-wilson.co.uk> <20200611080140.30228-6-chris@chris-wilson.co.uk> Date: Thu, 11 Jun 2020 13:07:30 +0300 Message-ID: <87h7vh9aql.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915/gt: Move gen4 GT workarounds from init_clock_gating to workarounds X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Wilson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Chris Wilson writes: > Rescue the GT workarounds from being buried inside init_clock_gating so > that we remember to apply them after a GT reset, and that they are > included in our verification that the workarounds are applied. > > Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 27 +++++++++++++++++---- > drivers/gpu/drm/i915/intel_pm.c | 15 ------------ > 2 files changed, 22 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index f8b9e104378e..7b4be64585c3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -715,15 +715,28 @@ int intel_engine_emit_ctx_wa(struct i915_request *rq) > } > > static void > -ilk_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) > +gen4_gt_workarounds_init(struct drm_i915_private *i915, > + struct i915_wa_list *wal) > { > - wa_masked_en(wal,_3D_CHICKEN2, _3D_CHICKEN2_WM_READ_PIPELINED); > + /* WaDisable_RenderCache_OperationalFlush:gen4,ilk */ > + wa_masked_dis(wal, CACHE_MODE_0, RC_OP_FLUSH_ENABLE); > +} > + > +static void > +g4x_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) > +{ > + gen4_gt_workarounds_init(i915, wal); > > - /* WaDisableRenderCachePipelinedFlush:ilk */ > + /* WaDisableRenderCachePipelinedFlush:g4x,ilk */ > wa_masked_en(wal, CACHE_MODE_0, CM0_PIPELINED_RENDER_FLUSH_DISABLE); > +} > > - /* WaDisable_RenderCache_OperationalFlush:ilk */ > - wa_masked_dis(wal, CACHE_MODE_0, RC_OP_FLUSH_ENABLE); > +static void > +ilk_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) > +{ > + g4x_gt_workarounds_init(i915, wal); > + > + wa_masked_en(wal,_3D_CHICKEN2, _3D_CHICKEN2_WM_READ_PIPELINED); > } > > static void > @@ -1209,6 +1222,10 @@ gt_init_workarounds(struct drm_i915_private *i915, struct i915_wa_list *wal) > snb_gt_workarounds_init(i915, wal); > else if (IS_GEN(i915, 5)) > ilk_gt_workarounds_init(i915, wal); > + else if (IS_G4X(i915)) > + g4x_gt_workarounds_init(i915, wal); > + else if (IS_GEN(i915, 4)) > + gen4_gt_workarounds_init(i915, wal); > else if (INTEL_GEN(i915) <= 8) > return; > else > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 7d82a7144a13..2a32d6230795 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -7399,13 +7399,6 @@ static void g4x_init_clock_gating(struct drm_i915_private *dev_priv) > dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE; > I915_WRITE(DSPCLK_GATE_D, dspclk_gate); > > - /* WaDisableRenderCachePipelinedFlush */ > - I915_WRITE(CACHE_MODE_0, > - _MASKED_BIT_ENABLE(CM0_PIPELINED_RENDER_FLUSH_DISABLE)); > - > - /* WaDisable_RenderCache_OperationalFlush:g4x */ > - I915_WRITE(CACHE_MODE_0, _MASKED_BIT_DISABLE(RC_OP_FLUSH_ENABLE)); > - > g4x_disable_trickle_feed(dev_priv); > } > > @@ -7421,11 +7414,6 @@ static void i965gm_init_clock_gating(struct drm_i915_private *dev_priv) > intel_uncore_write(uncore, > MI_ARB_STATE, > _MASKED_BIT_ENABLE(MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE)); > - > - /* WaDisable_RenderCache_OperationalFlush:gen4 */ > - intel_uncore_write(uncore, > - CACHE_MODE_0, > - _MASKED_BIT_DISABLE(RC_OP_FLUSH_ENABLE)); > } > > static void i965g_init_clock_gating(struct drm_i915_private *dev_priv) > @@ -7438,9 +7426,6 @@ static void i965g_init_clock_gating(struct drm_i915_private *dev_priv) > I915_WRITE(RENCLK_GATE_D2, 0); > I915_WRITE(MI_ARB_STATE, > _MASKED_BIT_ENABLE(MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE)); > - > - /* WaDisable_RenderCache_OperationalFlush:gen4 */ > - I915_WRITE(CACHE_MODE_0, _MASKED_BIT_DISABLE(RC_OP_FLUSH_ENABLE)); > } > > static void gen3_init_clock_gating(struct drm_i915_private *dev_priv) > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx