2013/11/1 Imre Deak <imre.deak@xxxxxxxxx>: > This way the code is simpler and can also be used for other platforms > where the audio power domain->power well mapping is different. > > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> Good idea! Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_pm.c | 10 ++-------- > 2 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 2c1921d..e2e72e8 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -100,6 +100,7 @@ enum intel_display_power_domain { > POWER_DOMAIN_TRANSCODER_C, > POWER_DOMAIN_TRANSCODER_EDP, > POWER_DOMAIN_VGA, > + POWER_DOMAIN_AUDIO, > POWER_DOMAIN_INIT, > > POWER_DOMAIN_NUM, > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 09ac9e7..34e1a8b 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -5653,10 +5653,7 @@ void i915_request_power_well(void) > > dev_priv = container_of(hsw_pwr, struct drm_i915_private, > power_domains); > - > - mutex_lock(&hsw_pwr->lock); > - __intel_power_well_get(dev_priv->dev, &hsw_pwr->power_wells[0]); > - mutex_unlock(&hsw_pwr->lock); > + intel_display_power_get(dev_priv->dev, POWER_DOMAIN_AUDIO); > } > EXPORT_SYMBOL_GPL(i915_request_power_well); > > @@ -5670,10 +5667,7 @@ void i915_release_power_well(void) > > dev_priv = container_of(hsw_pwr, struct drm_i915_private, > power_domains); > - > - mutex_lock(&hsw_pwr->lock); > - __intel_power_well_put(dev_priv->dev, &hsw_pwr->power_wells[0]); > - mutex_unlock(&hsw_pwr->lock); > + intel_display_power_put(dev_priv->dev, POWER_DOMAIN_AUDIO); > } > EXPORT_SYMBOL_GPL(i915_release_power_well); > > -- > 1.8.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx