From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 03/19] drm/i915: add forcewake functions that don't touch runtime PM Date: Thu, 27 Feb 2014 16:43:15 +0200 Message-ID: <1393512195.3479.3.camel@intelbox> References: <1387461309-2756-1-git-send-email-przanoni@gmail.com> <1387461309-2756-4-git-send-email-przanoni@gmail.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0100737325==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F57EFB784 for ; Thu, 27 Feb 2014 06:44:19 -0800 (PST) In-Reply-To: <1387461309-2756-4-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org --===============0100737325== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-I2lpmME1j9YyzmIk72q8" --=-I2lpmME1j9YyzmIk72q8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2013-12-19 at 11:54 -0200, Paulo Zanoni wrote: > From: Paulo Zanoni >=20 > To solve a chicken-and-egg problem. Currently when we get/put > forcewake we also get/put runtime PM and this works fine because the > runtime PM code doesn't need forcewake. But we're going to merge PC8 > and runtime PM into a single feature, and the PC8 code (the LCPLL > code) does need the forcewake, so that specific piece of code needs to > call the _no_rpm version so it doesn't try to get runtime PM in the > code that gets runtime PM. >=20 > For now the new functions are unused, we'll use them on the patch that > merges PC8 with runtime PM. >=20 > Signed-off-by: Paulo Zanoni Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.h | 4 ++++ > drivers/gpu/drm/i915/intel_uncore.c | 30 ++++++++++++++++++++---------- > 2 files changed, 24 insertions(+), 10 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index cc8afff..7f8ec08 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2533,6 +2533,10 @@ extern void intel_display_print_error_state(struct= drm_i915_error_state_buf *e, > */ > void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_en= gine); > void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_en= gine); > +void gen6_gt_force_wake_get_no_rpm(struct drm_i915_private *dev_priv, > + int fw_engine); > +void gen6_gt_force_wake_put_no_rpm(struct drm_i915_private *dev_priv, > + int fw_engine); > =20 > int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u8 mbox, u= 32 *val); > int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u8 mbox, = u32 val); > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/i= ntel_uncore.c > index 646fecf..6118d2c 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -368,15 +368,11 @@ void intel_uncore_sanitize(struct drm_device *dev) > * be called at the beginning of the sequence followed by a call to > * gen6_gt_force_wake_put() at the end of the sequence. > */ > -void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_en= gine) > +void gen6_gt_force_wake_get_no_rpm(struct drm_i915_private *dev_priv, > + int fw_engine) > { > unsigned long irqflags; > =20 > - if (!dev_priv->uncore.funcs.force_wake_get) > - return; > - > - intel_runtime_pm_get(dev_priv); > - > /* Redirect to VLV specific routine */ > if (IS_VALLEYVIEW(dev_priv->dev)) > return vlv_force_wake_get(dev_priv, fw_engine); > @@ -387,16 +383,23 @@ void gen6_gt_force_wake_get(struct drm_i915_private= *dev_priv, int fw_engine) > spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); > } > =20 > +void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv, int fw_en= gine) > +{ > + if (!dev_priv->uncore.funcs.force_wake_get) > + return; > + > + intel_runtime_pm_get(dev_priv); > + gen6_gt_force_wake_get_no_rpm(dev_priv, fw_engine); > +} > + > /* > * see gen6_gt_force_wake_get() > */ > -void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_en= gine) > +void gen6_gt_force_wake_put_no_rpm(struct drm_i915_private *dev_priv, > + int fw_engine) > { > unsigned long irqflags; > =20 > - if (!dev_priv->uncore.funcs.force_wake_put) > - return; > - > /* Redirect to VLV specific routine */ > if (IS_VALLEYVIEW(dev_priv->dev)) > return vlv_force_wake_put(dev_priv, fw_engine); > @@ -410,7 +413,14 @@ void gen6_gt_force_wake_put(struct drm_i915_private = *dev_priv, int fw_engine) > 1); > } > spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); > +} > + > +void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, int fw_en= gine) > +{ > + if (!dev_priv->uncore.funcs.force_wake_put) > + return; > =20 > + gen6_gt_force_wake_put_no_rpm(dev_priv, fw_engine); > intel_runtime_pm_put(dev_priv); > } > =20 --=-I2lpmME1j9YyzmIk72q8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTD08DAAoJEORIIAnNuWDF+1kIAI4H8Siy5JvlS2NohDpCJr9S Z8Ezc3duYA6kSANuBRuundi9Fi8jhejoMzBQZBOhMeuGStpt+FrN8MfcBAhTG2jR fytOT0tqILf5Cm+CsyV/EZKbcihDyEY6SdmolcMb/lBEPEF69t4tS+Odk9fzgCZa PZg9q13kdbI1BkuUp+gdMNpwFkdFDH0gzafJLXC3oRdd1auC6g51LFKE3WOFs4CZ APN4zsBNkMSEi+TcOWS0Tn7hn7J/9Vbx0rwrc6qzhzJZVFs6NMdSWYn8huMZrA0V uhZQJhfRtozX3CoC+x7yv9xHVPcfOeAL6xFedbLdNeT0lOsHGbaRh7wPMpZ0tfU= =0n7q -----END PGP SIGNATURE----- --=-I2lpmME1j9YyzmIk72q8-- --===============0100737325== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0100737325==--