summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-12-17 20:25:33 -0200
committerPaulo Zanoni <paulo.r.zanoni@intel.com>2014-02-26 18:42:34 -0300
commite685ce160d20c63f80cba582f932d72f75590e73 (patch)
tree7a2bf8768794b2ef396928964f3f1781d7f66cf8
parent0dac8c282b45359b8a6a4b19f0613ac4adb4e742 (diff)
drm/i915: remove an indirection level on PC8 functions
After the latest changes, the indirection is useless. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 49151725a164..ccdca8e4b681 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6673,12 +6673,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv)
hsw_disable_lcpll(dev_priv, true, true);
}
-static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv)
-{
- WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock));
- intel_runtime_pm_put(dev_priv);
-}
-
void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
@@ -6706,19 +6700,13 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv)
dev_priv->pc8.enabled = false;
}
-static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv)
-{
- WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock));
- intel_runtime_pm_get(dev_priv);
-}
-
void hsw_enable_package_c8(struct drm_i915_private *dev_priv)
{
if (!HAS_PC8(dev_priv->dev))
return;
mutex_lock(&dev_priv->pc8.lock);
- __hsw_enable_package_c8(dev_priv);
+ intel_runtime_pm_put(dev_priv);
mutex_unlock(&dev_priv->pc8.lock);
}
@@ -6728,7 +6716,7 @@ void hsw_disable_package_c8(struct drm_i915_private *dev_priv)
return;
mutex_lock(&dev_priv->pc8.lock);
- __hsw_disable_package_c8(dev_priv);
+ intel_runtime_pm_get(dev_priv);
mutex_unlock(&dev_priv->pc8.lock);
}