From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 08/10] drm/i915: introduce haswell_init_clock_gating Date: Tue, 3 Jul 2012 22:24:18 +0200 Message-ID: <20120703202418.GE5103@phenom.ffwll.local> References: <1341240671-5843-1-git-send-email-eugeni.dodonov@intel.com> <1341240671-5843-9-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id BE1609E709 for ; Tue, 3 Jul 2012 13:24:21 -0700 (PDT) Received: by werb13 with SMTP id b13so2080169wer.36 for ; Tue, 03 Jul 2012 13:24:20 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1341240671-5843-9-git-send-email-eugeni.dodonov@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Jul 02, 2012 at 11:51:09AM -0300, Eugeni Dodonov wrote: > This is based on Ivy Bridge clock gating for now, but is subject to > changes in the future. > > Signed-off-by: Eugeni Dodonov This copy of presumeably the ivb clock gate code is missing the changes introduce in: commit 208482232de3590cee4757dfabe5d8cee8c6e626 Author: Ben Widawsky Date: Fri May 4 18:58:59 2012 -0700 drm/i915: set IDICOS to medium uncore resources I guess that's not quite intentional ... All the previous patches up to here are queued for -next, thanks. -Daniel > --- > drivers/gpu/drm/i915/intel_pm.c | 54 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 53 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 5ea8319..f54196f 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3415,6 +3415,58 @@ static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv) > I915_WRITE(GEN7_FF_THREAD_MODE, reg); > } > > +static void haswell_init_clock_gating(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + int pipe; > + uint32_t dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE; > + > + I915_WRITE(PCH_DSPCLK_GATE_D, dspclk_gate); > + > + I915_WRITE(WM3_LP_ILK, 0); > + I915_WRITE(WM2_LP_ILK, 0); > + I915_WRITE(WM1_LP_ILK, 0); > + > + /* According to the spec, bit 13 (RCZUNIT) must be set on IVB. > + * This implements the WaDisableRCZUnitClockGating workaround. > + */ > + I915_WRITE(GEN6_UCGCTL2, GEN6_RCZUNIT_CLOCK_GATE_DISABLE); > + > + I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE); > + > + I915_WRITE(IVB_CHICKEN3, > + CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE | > + CHICKEN3_DGMG_DONE_FIX_DISABLE); > + > + /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */ > + I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1, > + GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC); > + > + /* WaApplyL3ControlAndL3ChickenMode requires those two on Ivy Bridge */ > + I915_WRITE(GEN7_L3CNTLREG1, > + GEN7_WA_FOR_GEN7_L3_CONTROL); > + I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, > + GEN7_WA_L3_CHICKEN_MODE); > + > + /* This is required by WaCatErrorRejectionIssue */ > + I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG, > + I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | > + GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); > + > + for_each_pipe(pipe) { > + I915_WRITE(DSPCNTR(pipe), > + I915_READ(DSPCNTR(pipe)) | > + DISPPLANE_TRICKLE_FEED_DISABLE); > + intel_flush_display_plane(dev_priv, pipe); > + } > + > + gen7_setup_fixed_func_scheduler(dev_priv); > + > + /* WaDisable4x2SubspanOptimization */ > + I915_WRITE(CACHE_MODE_1, > + _MASKED_BIT_ENABLE(PIXEL_SUBSPAN_COLLECT_OPT_DISABLE)); > +} > + > static void ivybridge_init_clock_gating(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > @@ -3824,7 +3876,7 @@ void intel_init_pm(struct drm_device *dev) > "Disable CxSR\n"); > dev_priv->display.update_wm = NULL; > } > - dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; > + dev_priv->display.init_clock_gating = haswell_init_clock_gating; > dev_priv->display.sanitize_pm = gen6_sanitize_pm; > } else > dev_priv->display.update_wm = NULL; > -- > 1.7.11.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48