From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 02/19] drm/i915: fold in __intel_power_well_get/put functions Date: Mon, 24 Feb 2014 16:07:53 +0200 Message-ID: <1393250873.13131.116.camel@intelbox> References: <1392674540-10915-1-git-send-email-imre.deak@intel.com> <1392674540-10915-3-git-send-email-imre.deak@intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1425715300==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E347FAA97 for ; Mon, 24 Feb 2014 06:07:55 -0800 (PST) In-Reply-To: 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 Graphics Development List-Id: intel-gfx@lists.freedesktop.org --===============1425715300== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-Oc389LHqDl52QMimYP3m" --=-Oc389LHqDl52QMimYP3m Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2014-02-24 at 10:23 -0300, Paulo Zanoni wrote: > 2014-02-17 19:02 GMT-03:00 Imre Deak : > > These functions are used only by a single call site and are simple > > enough to just fold them in. > > > > No functional change. > > > > Signed-off-by: Imre Deak >=20 > IMHO, this makes the code harder to read. I would prefer to not have > this change. I find intel_display_power_put() after patch 19/19 simple enough to not have the separate functions. I'd say that in this case readability is actually better with the inlined version, as you don't have to jump between two functions when reading the code. --Imre > > --- > > drivers/gpu/drm/i915/intel_pm.c | 37 +++++++++++++--------------------= ---- > > 1 file changed, 13 insertions(+), 24 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/int= el_pm.c > > index aa9c2df..db48d55 100644 > > --- a/drivers/gpu/drm/i915/intel_pm.c > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > @@ -5305,27 +5305,6 @@ static void hsw_set_power_well(struct drm_i915_p= rivate *dev_priv, > > } > > } > > > > -static void __intel_power_well_get(struct drm_i915_private *dev_priv, > > - struct i915_power_well *power_well) > > -{ > > - if (!power_well->count++ && power_well->set) { > > - hsw_disable_package_c8(dev_priv); > > - power_well->set(dev_priv, power_well, true); > > - } > > -} > > - > > -static void __intel_power_well_put(struct drm_i915_private *dev_priv, > > - struct i915_power_well *power_well) > > -{ > > - WARN_ON(!power_well->count); > > - > > - if (!--power_well->count && power_well->set && > > - i915.disable_power_well) { > > - power_well->set(dev_priv, power_well, false); > > - hsw_enable_package_c8(dev_priv); > > - } > > -} > > - > > void intel_display_power_get(struct drm_i915_private *dev_priv, > > enum intel_display_power_domain domain) > > { > > @@ -5338,7 +5317,10 @@ void intel_display_power_get(struct drm_i915_pri= vate *dev_priv, > > mutex_lock(&power_domains->lock); > > > > for_each_power_well(i, power_well, BIT(domain), power_domains) > > - __intel_power_well_get(dev_priv, power_well); > > + if (!power_well->count++ && power_well->set) { > > + hsw_disable_package_c8(dev_priv); > > + power_well->set(dev_priv, power_well, true); > > + } > > > > power_domains->domain_use_count[domain]++; > > > > @@ -5359,8 +5341,15 @@ void intel_display_power_put(struct drm_i915_pri= vate *dev_priv, > > WARN_ON(!power_domains->domain_use_count[domain]); > > power_domains->domain_use_count[domain]--; > > > > - for_each_power_well_rev(i, power_well, BIT(domain), power_domai= ns) > > - __intel_power_well_put(dev_priv, power_well); > > + for_each_power_well_rev(i, power_well, BIT(domain), power_domai= ns) { > > + WARN_ON(!power_well->count); > > + > > + if (!--power_well->count && power_well->set && > > + i915.disable_power_well) { > > + power_well->set(dev_priv, power_well, false); > > + hsw_enable_package_c8(dev_priv); > > + } > > + } > > > > mutex_unlock(&power_domains->lock); > > } > > -- > > 1.8.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >=20 >=20 >=20 --=-Oc389LHqDl52QMimYP3m 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) iQEcBAABAgAGBQJTC1I5AAoJEORIIAnNuWDFjP4H/jBEgaY1KpEDUK1kfwfPJLJ9 gFU6fD/18hsLbjK9tkXRTxkwXXH9J81jZb0tEvQwUoDaVWqe2nDO43JTkeYLPTON 4GrfuZotyTT8QZzyu8xxO02qJ3P3LN3ovgxnoRex6Firski7ujwNK5intouy+QDB /EkuUTG9eHzz81tamWQ8Geulg5bxe8lgkzvHiRGhKSPvdhHBK6YjEfSozs0JUM6s aC68Ps7yp2QNZHJay8zLYQdnSnRutmDxAFqRWa5ZSE/qJxQjZryzCnAn8Hbg+ogo Yj68cvgryMlRMOKQ01DFAODky2iHCe6ayx9ojBLfvpoHxtQ/9BbBARrFeF/Dsi4= =+mnN -----END PGP SIGNATURE----- --=-Oc389LHqDl52QMimYP3m-- --===============1425715300== 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 --===============1425715300==--