From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 10/20] drm/i915: allow force wake at init time on VLV v2 Date: Tue, 19 Mar 2013 08:38:53 +0200 Message-ID: <20130319063853.GH4469@intel.com> References: <1362768363-3710-1-git-send-email-jbarnes@virtuousgeek.org> <1362768363-3710-10-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2987BE5C55 for ; Mon, 18 Mar 2013 23:38:57 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1362768363-3710-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 Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 08, 2013 at 10:45:53AM -0800, Jesse Barnes wrote: > We need to set the 'allow force wake' bit to enable forcewake handling > later on. > = > v2: split from clock gating patch (Jani) > check for allowwakeack (Ville) > = > Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/i915_gem.c | 9 +++++++++ > drivers/gpu/drm/i915/i915_reg.h | 2 ++ > 2 files changed, 11 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_= gem.c > index 1417fc6..d554b21 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -4010,7 +4010,16 @@ int i915_gem_init(struct drm_device *dev) > int ret; > = > mutex_lock(&dev->struct_mutex); > + > + if (IS_VALLEYVIEW(dev)) { > + /* VLVA0 (potential hack), BIOS isn't actually waking us */ > + I915_WRITE(VLV_GTLC_WAKE_CTRL, 1); > + if (wait_for((I915_READ(VLV_GTLC_PW_STATUS) & 1) =3D=3D 1, 10)) > + DRM_DEBUG_DRIVER("allow wake ack timed out\n"); > + } > + > i915_gem_init_global_gtt(dev); > + > ret =3D 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 ed35805..cf291b6 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -4268,6 +4268,8 @@ > #define FORCEWAKE_ACK_VLV 0x1300b4 > #define FORCEWAKE_ACK_HSW 0x130044 > #define FORCEWAKE_ACK 0x130090 > +#define VLV_GTLC_WAKE_CTRL 0x130090 > +#define VLV_GTLC_PW_STATUS 0x130094 > #define FORCEWAKE_MT 0xa188 /* multi-threaded */ > #define FORCEWAKE_KERNEL 0x1 > #define FORCEWAKE_USER 0x2 > -- = > 1.7.10.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC