Commit e1f2de6def8647cf69f8d15e944a9d9cda4292d4
Committed by
Daniel Vetter
Daniel Vetter
1 parent
34f5754c23
Exists in
master
and in
13 other branches
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>
Showing 1 changed file with 2 additions and 14 deletions Side-by-side Diff
drivers/gpu/drm/i915/intel_display.c
| ... | ... | @@ -7046,12 +7046,6 @@ |
| 7046 | 7046 | hsw_disable_lcpll(dev_priv, true, true); |
| 7047 | 7047 | } |
| 7048 | 7048 | |
| 7049 | -static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv) | |
| 7050 | -{ | |
| 7051 | - WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); | |
| 7052 | - intel_runtime_pm_put(dev_priv); | |
| 7053 | -} | |
| 7054 | - | |
| 7055 | 7049 | void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) |
| 7056 | 7050 | { |
| 7057 | 7051 | struct drm_device *dev = dev_priv->dev; |
| 7058 | 7052 | |
| ... | ... | @@ -7079,19 +7073,13 @@ |
| 7079 | 7073 | dev_priv->pc8.enabled = false; |
| 7080 | 7074 | } |
| 7081 | 7075 | |
| 7082 | -static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv) | |
| 7083 | -{ | |
| 7084 | - WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); | |
| 7085 | - intel_runtime_pm_get(dev_priv); | |
| 7086 | -} | |
| 7087 | - | |
| 7088 | 7076 | void hsw_enable_package_c8(struct drm_i915_private *dev_priv) |
| 7089 | 7077 | { |
| 7090 | 7078 | if (!HAS_PC8(dev_priv->dev)) |
| 7091 | 7079 | return; |
| 7092 | 7080 | |
| 7093 | 7081 | mutex_lock(&dev_priv->pc8.lock); |
| 7094 | - __hsw_enable_package_c8(dev_priv); | |
| 7082 | + intel_runtime_pm_put(dev_priv); | |
| 7095 | 7083 | mutex_unlock(&dev_priv->pc8.lock); |
| 7096 | 7084 | } |
| 7097 | 7085 | |
| ... | ... | @@ -7101,7 +7089,7 @@ |
| 7101 | 7089 | return; |
| 7102 | 7090 | |
| 7103 | 7091 | mutex_lock(&dev_priv->pc8.lock); |
| 7104 | - __hsw_disable_package_c8(dev_priv); | |
| 7092 | + intel_runtime_pm_get(dev_priv); | |
| 7105 | 7093 | mutex_unlock(&dev_priv->pc8.lock); |
| 7106 | 7094 | } |
| 7107 | 7095 |