Re: [alsa-devel] [Intel-gfx] [PATCH 5/5] drm/i915: remove unused power_well/get_cdclk_freq api

On Mon, 08 Dec 2014, Imre Deak imre.deak@intel.com wrote:

After switching to using the component interface this API isn't needed any more.

\o/

Signed-off-by: Imre Deak imre.deak@intel.com

drivers/gpu/drm/i915/intel_runtime_pm.c | 56 --------------------------------- include/drm/i915_powerwell.h | 37 ---------------------- 2 files changed, 93 deletions(-) delete mode 100644 include/drm/i915_powerwell.h

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 8a2bd18..0c9ab32 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -31,7 +31,6 @@

#include "i915_drv.h" #include "intel_drv.h" -#include <drm/i915_powerwell.h>

/**

• DOC: runtime pm

@@ -50,8 +49,6 @@

• present for a given platform.

*/

-static struct i915_power_domains *hsw_pwr;

#define for_each_power_well(i, power_well, domain_mask, power_domains) \ for (i = 0; \ i < (power_domains)->power_well_count && \ @@ -1098,10 +1095,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) */ if (IS_HASWELL(dev_priv->dev)) { set_power_wells(power_domains, hsw_power_wells);

• hsw_pwr = power_domains;
  

  } else if (IS_BROADWELL(dev_priv->dev)) { set_power_wells(power_domains, bdw_power_wells);

• hsw_pwr = power_domains;
  

  } else if (IS_CHERRYVIEW(dev_priv->dev)) { set_power_wells(power_domains, chv_power_wells); } else if (IS_VALLEYVIEW(dev_priv->dev)) {

@@ -1145,8 +1140,6 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv) * the power well is not enabled, so just enable it in case * we're going to unload/reload. */ intel_display_set_init_power(dev_priv, true);

• hsw_pwr = NULL;

}

static void intel_power_domains_resume(struct drm_i915_private *dev_priv) @@ -1355,52 +1348,3 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) pm_runtime_put_autosuspend(device); }

-/* Display audio driver power well request */ -int i915_request_power_well(void) -{

• struct drm_i915_private *dev_priv;
• if (!hsw_pwr)

• return -ENODEV;
  

• dev_priv = container_of(hsw_pwr, struct drm_i915_private,

• 		power_domains);
  

• intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
• return 0;

-} -EXPORT_SYMBOL_GPL(i915_request_power_well);

-/* Display audio driver power well release */ -int i915_release_power_well(void) -{

• struct drm_i915_private *dev_priv;
• if (!hsw_pwr)

• return -ENODEV;
  

• dev_priv = container_of(hsw_pwr, struct drm_i915_private,

• 		power_domains);
  

• intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
• return 0;

-} -EXPORT_SYMBOL_GPL(i915_release_power_well);

-/*

• • Private interface for the audio driver to get CDCLK in kHz.
• • Caller must request power well using i915_request_power_well() prior to
• • making the call.
• */

-int i915_get_cdclk_freq(void) -{

• struct drm_i915_private *dev_priv;
• if (!hsw_pwr)

• return -ENODEV;
  

• dev_priv = container_of(hsw_pwr, struct drm_i915_private,

• 		power_domains);
  

• return intel_ddi_get_cdclk_freq(dev_priv);

-} -EXPORT_SYMBOL_GPL(i915_get_cdclk_freq); diff --git a/include/drm/i915_powerwell.h b/include/drm/i915_powerwell.h deleted file mode 100644 index baa6f11..0000000 --- a/include/drm/i915_powerwell.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************

• • Copyright 2013 Intel Inc.
• • All Rights Reserved.
• • Permission is hereby granted, free of charge, to any person obtaining a
• • copy of this software and associated documentation files (the
• • "Software"), to deal in the Software without restriction, including
• • without limitation the rights to use, copy, modify, merge, publish,
• • distribute, sub license, and/or sell copies of the Software, and to
• • permit persons to whom the Software is furnished to do so, subject to
• • the following conditions:
• • The above copyright notice and this permission notice (including the
• • next paragraph) shall be included in all copies or substantial portions
• • of the Software.
• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
• • IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
• • FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
• • THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
• • DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
• • OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
• • USE OR OTHER DEALINGS IN THE SOFTWARE.
• **************************************************************************/

-#ifndef _I915_POWERWELL_H_ -#define _I915_POWERWELL_H_

-/* For use by hda_i915 driver */ -extern int i915_request_power_well(void); -extern int i915_release_power_well(void); -extern int i915_get_cdclk_freq(void);

-#endif /* _I915_POWERWELL_H_ */

1.8.4

---

Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx