evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: remove an indirection level on PC8 functions

Browse source 
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>
This commit is contained in:
Paulo Zanoni 2014-03-07 20:08:10 -03:00 • committed by Daniel Vetter
parent 34f5754c23
commit e1f2de6def
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/i915/intel_display.c
View file

@ -7046,12 +7046,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv)
hsw_disable_lcpll(dev_priv, true, true); 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) void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = dev_priv->dev; 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; 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) void hsw_enable_package_c8(struct drm_i915_private *dev_priv)
{ {
if (!HAS_PC8(dev_priv->dev)) if (!HAS_PC8(dev_priv->dev))
return; return;
mutex_lock(&dev_priv->pc8.lock); mutex_lock(&dev_priv->pc8.lock);
__hsw_enable_package_c8(dev_priv); intel_runtime_pm_put(dev_priv);
mutex_unlock(&dev_priv->pc8.lock); mutex_unlock(&dev_priv->pc8.lock);
} }
@ -7101,7 +7089,7 @@ void hsw_disable_package_c8(struct drm_i915_private *dev_priv)
return; return;
mutex_lock(&dev_priv->pc8.lock); mutex_lock(&dev_priv->pc8.lock);
__hsw_disable_package_c8(dev_priv); intel_runtime_pm_get(dev_priv);
mutex_unlock(&dev_priv->pc8.lock); mutex_unlock(&dev_priv->pc8.lock);
} }