From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 10/26] drm/i915: add more clock gating for VLV, allow force wake at init Date: Fri, 08 Mar 2013 15:39:55 +0200 Message-ID: <87d2vaui1g.fsf@intel.com> References: <1362175722-9281-1-git-send-email-jbarnes@virtuousgeek.org> <1362175722-9281-10-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 29C31E6D3E for ; Fri, 8 Mar 2013 05:39:22 -0800 (PST) In-Reply-To: <1362175722-9281-10-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sat, 02 Mar 2013, Jesse Barnes wrote: > From: Ben Widawsky > > Disable all Gunit clock gating and make set the "allow force wake" bit. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/i915_gem.c | 4 ++++ > drivers/gpu/drm/i915/i915_reg.h | 1 + > drivers/gpu/drm/i915/intel_pm.c | 10 +++++++++- > 3 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 8413ffc..dd67698 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4010,7 +4010,11 @@ int i915_gem_init(struct drm_device *dev) > int ret; > > mutex_lock(&dev->struct_mutex); > + > + /* VLVA0 (potential hack), BIOS isn't actually waking us */ > + I915_WRITE(VLV_GTLC_WAKE_CTRL, 1); Wrap that in if IS_VALLEYVIEW(dev)? Separate this from the other hunk into a separate patch? Jani. > i915_gem_init_global_gtt(dev); > + > ret = i915_gem_init_hw(dev); > mutex_unlock(&dev->struct_mutex); > if (ret) { > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 539301d..6c037b2 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -4273,6 +4273,7 @@ > #define FORCEWAKE_ACK_VLV 0x1300b4 > #define FORCEWAKE_ACK_HSW 0x130044 > #define FORCEWAKE_ACK 0x130090 > +#define VLV_GTLC_WAKE_CTRL 0x130090 > #define FORCEWAKE_MT 0xa188 /* multi-threaded */ > #define FORCEWAKE_KERNEL 0x1 > #define FORCEWAKE_USER 0x2 > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 59ea12a..f29a1a2 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3987,7 +3987,15 @@ static void valleyview_init_clock_gating(struct drm_device *dev) > * Disable clock gating on th GCFG unit to prevent a delay > * in the reporting of vblank events. > */ > - I915_WRITE(VLV_GUNIT_CLOCK_GATE, GCFG_DIS); > + /* VLVA0 HACK */ > + I915_WRITE(VLV_GUNIT_CLOCK_GATE, 0xffffffff); > + I915_WRITE(0x9400, 0xffffffff); > + I915_WRITE(0x9404, 0xffffffff); > + I915_WRITE(0x9408, 0xffffffff); > + I915_WRITE(0x940c, 0xffffffff); > + I915_WRITE(0x9410, 0xffffffff); > + I915_WRITE(0x9414, 0xffffffff); > + I915_WRITE(0x9418, 0xffffffff); > } > > static void g4x_init_clock_gating(struct drm_device *dev) > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx