diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-03-07 18:08:17 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 11:40:25 -0400 |
commit | a14cb6fc851d09bdb2c95f26d81842d5b4fa7164 (patch) | |
tree | ef06481cdf90cf623542e7aecf5d4b236dfed207 | |
parent | d688e0955003794fc5a25a1fd574202d64541a34 (diff) |
drm/i915: rename __hsw_do_{en, dis}able_pc8
After we removed all the intermediate abstractions, we can rename
these functions to just hsw_{en,dis}able_pc8.
v2: - Rebase.
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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9aa01bfcd068..fa5d0ed76378 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -845,7 +845,7 @@ static int i915_runtime_suspend(struct device *device) | |||
845 | DRM_DEBUG_KMS("Suspending device\n"); | 845 | DRM_DEBUG_KMS("Suspending device\n"); |
846 | 846 | ||
847 | if (HAS_PC8(dev)) | 847 | if (HAS_PC8(dev)) |
848 | __hsw_do_enable_pc8(dev_priv); | 848 | hsw_enable_pc8(dev_priv); |
849 | 849 | ||
850 | i915_gem_release_all_mmaps(dev_priv); | 850 | i915_gem_release_all_mmaps(dev_priv); |
851 | 851 | ||
@@ -879,7 +879,7 @@ static int i915_runtime_resume(struct device *device) | |||
879 | dev_priv->pm.suspended = false; | 879 | dev_priv->pm.suspended = false; |
880 | 880 | ||
881 | if (HAS_PC8(dev)) | 881 | if (HAS_PC8(dev)) |
882 | __hsw_do_disable_pc8(dev_priv); | 882 | hsw_disable_pc8(dev_priv); |
883 | 883 | ||
884 | DRM_DEBUG_KMS("Device resumed\n"); | 884 | DRM_DEBUG_KMS("Device resumed\n"); |
885 | return 0; | 885 | return 0; |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4b5cffa3f033..2fd53bc697aa 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -7024,7 +7024,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) | |||
7024 | spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); | 7024 | spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); |
7025 | } | 7025 | } |
7026 | 7026 | ||
7027 | void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) | 7027 | void hsw_enable_pc8(struct drm_i915_private *dev_priv) |
7028 | { | 7028 | { |
7029 | struct drm_device *dev = dev_priv->dev; | 7029 | struct drm_device *dev = dev_priv->dev; |
7030 | uint32_t val; | 7030 | uint32_t val; |
@@ -7044,7 +7044,7 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) | |||
7044 | hsw_disable_lcpll(dev_priv, true, true); | 7044 | hsw_disable_lcpll(dev_priv, true, true); |
7045 | } | 7045 | } |
7046 | 7046 | ||
7047 | void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) | 7047 | void hsw_disable_pc8(struct drm_i915_private *dev_priv) |
7048 | { | 7048 | { |
7049 | struct drm_device *dev = dev_priv->dev; | 7049 | struct drm_device *dev = dev_priv->dev; |
7050 | uint32_t val; | 7050 | uint32_t val; |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index a0d4315045be..60ffad376390 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -725,8 +725,8 @@ unsigned long intel_gen4_compute_page_offset(int *x, int *y, | |||
725 | unsigned int bpp, | 725 | unsigned int bpp, |
726 | unsigned int pitch); | 726 | unsigned int pitch); |
727 | void intel_display_handle_reset(struct drm_device *dev); | 727 | void intel_display_handle_reset(struct drm_device *dev); |
728 | void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv); | 728 | void hsw_enable_pc8(struct drm_i915_private *dev_priv); |
729 | void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv); | 729 | void hsw_disable_pc8(struct drm_i915_private *dev_priv); |
730 | void intel_dp_get_m_n(struct intel_crtc *crtc, | 730 | void intel_dp_get_m_n(struct intel_crtc *crtc, |
731 | struct intel_crtc_config *pipe_config); | 731 | struct intel_crtc_config *pipe_config); |
732 | int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); | 732 | int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); |