From: Jesse Barnes Subject: Re: [PATCH v2 07/21] drm/i915: add noop power well handlers instead of NULL checking them Date: Thu, 6 Mar 2014 11:02:14 -0800 Message-ID: <20140306110214.3bafb0e1@jbarnes-desktop> References: <1393953790-20733-1-git-send-email-imre.deak@intel.com> <1393953790-20733-8-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy12-pub.mail.unifiedlayer.com (oproxy12-pub.mail.unifiedlayer.com [50.87.16.10]) by gabe.freedesktop.org (Postfix) with SMTP id 5C352FAEF4 for ; Thu, 6 Mar 2014 11:01:40 -0800 (PST) In-Reply-To: <1393953790-20733-8-git-send-email-imre.deak@intel.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: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 4 Mar 2014 19:22:56 +0200 Imre Deak wrote: > Reading code free of special cases wins over the small overhead of > calling a noop handler. Suggested by Jesse. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/intel_pm.c | 29 +++++++++++++++++++++-------- > 1 file changed, 21 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 7866426..a94f5dd 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -5332,6 +5332,17 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv, > hsw_enable_package_c8(dev_priv); > } > > +static void i9xx_always_on_power_well_noop(struct drm_i915_private *dev_priv, > + struct i915_power_well *power_well) > +{ > +} > + > +static bool i9xx_always_on_power_well_enabled(struct drm_i915_private *dev_priv, > + struct i915_power_well *power_well) > +{ > + return true; > +} > + > void intel_display_power_get(struct drm_i915_private *dev_priv, > enum intel_display_power_domain domain) > { > @@ -5344,7 +5355,7 @@ void intel_display_power_get(struct drm_i915_private *dev_priv, > mutex_lock(&power_domains->lock); > > for_each_power_well(i, power_well, BIT(domain), power_domains) > - if (!power_well->count++ && power_well->ops->enable) > + if (!power_well->count++) > power_well->ops->enable(dev_priv, power_well); > > power_domains->domain_use_count[domain]++; > @@ -5369,8 +5380,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, > for_each_power_well_rev(i, power_well, BIT(domain), power_domains) { > WARN_ON(!power_well->count); > > - if (!--power_well->count && power_well->ops->disable && > - i915.disable_power_well) > + if (!--power_well->count && i915.disable_power_well) > power_well->ops->disable(dev_priv, power_well); > } > > @@ -5424,7 +5434,12 @@ EXPORT_SYMBOL_GPL(i915_release_power_well); > (POWER_DOMAIN_MASK & ~BDW_ALWAYS_ON_POWER_DOMAINS) | \ > BIT(POWER_DOMAIN_INIT)) > > -static const struct i915_power_well_ops i9xx_always_on_power_well_ops = { }; > +static const struct i915_power_well_ops i9xx_always_on_power_well_ops = { > + .sync_hw = i9xx_always_on_power_well_noop, > + .enable = i9xx_always_on_power_well_noop, > + .disable = i9xx_always_on_power_well_noop, > + .is_enabled = i9xx_always_on_power_well_enabled, > +}; > > static struct i915_power_well i9xx_always_on_power_well[] = { > { > @@ -5510,10 +5525,8 @@ static void intel_power_domains_resume(struct drm_i915_private *dev_priv) > int i; > > mutex_lock(&power_domains->lock); > - for_each_power_well(i, power_well, POWER_DOMAIN_MASK, power_domains) { > - if (power_well->ops->sync_hw) > - power_well->ops->sync_hw(dev_priv, power_well); > - } > + for_each_power_well(i, power_well, POWER_DOMAIN_MASK, power_domains) > + power_well->ops->sync_hw(dev_priv, power_well); > mutex_unlock(&power_domains->lock); > } > Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center