summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-03-07 20:08:10 -0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-19 16:39:12 +0100
commite1f2de6def8647cf69f8d15e944a9d9cda4292d4 (patch)
tree48d2b62ca920194a162ff4d477b3e70e8dd8310c /drivers/gpu
parent34f5754c239b0cae69130b8e67bb2226560c09d4 (diff)
downloadop-kernel-dev-e1f2de6def8647cf69f8d15e944a9d9cda4292d4.zip
op-kernel-dev-e1f2de6def8647cf69f8d15e944a9d9cda4292d4.tar.gz
drm/i915: remove an indirection level on PC8 functions
After the latest changes, the indirection is useless. Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-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 1e1cdcf..e7e2894 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7046,12 +7046,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;
@@ -7079,19 +7073,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);
}
@@ -7101,7 +7089,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);
}
OpenPOWER on IntegriCloud