From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 02/19] drm/i915: get/put runtime PM without holding rps.hw_lock Date: Thu, 27 Feb 2014 15:45:35 +0200 Message-ID: <1393508735.3479.2.camel@intelbox> References: <1387461309-2756-1-git-send-email-przanoni@gmail.com> <1387461309-2756-3-git-send-email-przanoni@gmail.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1532345385==" Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 35157FB6F9 for ; Thu, 27 Feb 2014 05:45:37 -0800 (PST) In-Reply-To: <1387461309-2756-3-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 --===============1532345385== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-d6is1ht7+PfM3ht4FSNu" --=-d6is1ht7+PfM3ht4FSNu 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 > We'll need this when we merge PC8 and Runtime PM: the PC8 > enable/disable functions need that lock. >=20 > Also, it's good practice to not hold a lock for longer than strictly > needed. >=20 > Signed-off-by: Paulo Zanoni Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_debugfs.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i= 915_debugfs.c > index 430eb3e..1cdc5dd 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1414,7 +1414,7 @@ static int i915_ring_freq_table(struct seq_file *m,= void *unused) > struct drm_info_node *node =3D (struct drm_info_node *) m->private; > struct drm_device *dev =3D node->minor->dev; > drm_i915_private_t *dev_priv =3D dev->dev_private; > - int ret; > + int ret =3D 0; > int gpu_freq, ia_freq; > =20 > if (!(IS_GEN6(dev) || IS_GEN7(dev))) { > @@ -1422,12 +1422,13 @@ static int i915_ring_freq_table(struct seq_file *= m, void *unused) > return 0; > } > =20 > + intel_runtime_pm_get(dev_priv); > + > flush_delayed_work(&dev_priv->rps.delayed_resume_work); > =20 > ret =3D mutex_lock_interruptible(&dev_priv->rps.hw_lock); > if (ret) > - return ret; > - intel_runtime_pm_get(dev_priv); > + goto out; > =20 > seq_puts(m, "GPU freq (MHz)\tEffective CPU freq (MHz)\tEffective Ring f= req (MHz)\n"); > =20 > @@ -1444,10 +1445,11 @@ static int i915_ring_freq_table(struct seq_file *= m, void *unused) > ((ia_freq >> 8) & 0xff) * 100); > } > =20 > - intel_runtime_pm_put(dev_priv); > mutex_unlock(&dev_priv->rps.hw_lock); > =20 > - return 0; > +out: > + intel_runtime_pm_put(dev_priv); > + return ret; > } > =20 > static int i915_gfxec(struct seq_file *m, void *unused) --=-d6is1ht7+PfM3ht4FSNu 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) iQEcBAABAgAGBQJTD0F/AAoJEORIIAnNuWDFf8EH/j/okorrX3l16/e2w/dzDZkh 7J40QJBfQ2tsYb0nzV1sc9CWOw4AFEBiueAZGrTbJEXiYGVPMizhlcZ1X7/6c/+w DTgKhNYLqdxS1Z3IUWM6h9q/MPqY17rxy/WvxtmrK15NobW2l/yRHQEHuhploBj5 G4dbzfqfBm8DxggzgXMHI6tGDk0/MPgBQpBNOd7vxwElyCxvsa5nffq07Gg0+WDG Qxp53lP8FA9j2/IU7zypvT+5pxmkuevmiQNSUYdeQ9cYM7t4T8h3VGe8OxyRQBqh FwoFPO8UOO5REjHtGTF2iC4zscTalVQX95SsNl7+3V+l+IBH65FcaD4QfgUvsCs= =r+fm -----END PGP SIGNATURE----- --=-d6is1ht7+PfM3ht4FSNu-- --===============1532345385== 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 --===============1532345385==--