diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-09-24 12:52:57 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-01 01:45:19 -0400 |
commit | 6ff58d537c58cb7332bfc54ff6d6f99e344755f4 (patch) | |
tree | 3323aaab618f0a730206db3d80f074e6cdef0dca /drivers | |
parent | 6743768082aa5fed2009d67329c22e6a3bdf0f8d (diff) |
drm/i915: make hsw_{disable, restore}_lcpll static
These functions were added before the final PC8 implementation, and
their callers moved to intel_display.c during the code review.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3d72b996da16..5fa58ade76a8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -6157,8 +6157,8 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv) | |||
6157 | * register. Callers should take care of disabling all the display engine | 6157 | * register. Callers should take care of disabling all the display engine |
6158 | * functions, doing the mode unset, fixing interrupts, etc. | 6158 | * functions, doing the mode unset, fixing interrupts, etc. |
6159 | */ | 6159 | */ |
6160 | void hsw_disable_lcpll(struct drm_i915_private *dev_priv, | 6160 | static void hsw_disable_lcpll(struct drm_i915_private *dev_priv, |
6161 | bool switch_to_fclk, bool allow_power_down) | 6161 | bool switch_to_fclk, bool allow_power_down) |
6162 | { | 6162 | { |
6163 | uint32_t val; | 6163 | uint32_t val; |
6164 | 6164 | ||
@@ -6208,7 +6208,7 @@ void hsw_disable_lcpll(struct drm_i915_private *dev_priv, | |||
6208 | * Fully restores LCPLL, disallowing power down and switching back to LCPLL | 6208 | * Fully restores LCPLL, disallowing power down and switching back to LCPLL |
6209 | * source. | 6209 | * source. |
6210 | */ | 6210 | */ |
6211 | void hsw_restore_lcpll(struct drm_i915_private *dev_priv) | 6211 | static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) |
6212 | { | 6212 | { |
6213 | uint32_t val; | 6213 | uint32_t val; |
6214 | 6214 | ||
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5b63cc699a20..a92f48176321 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -675,9 +675,6 @@ extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, | |||
675 | unsigned int bpp, | 675 | unsigned int bpp, |
676 | unsigned int pitch); | 676 | unsigned int pitch); |
677 | extern void intel_display_handle_reset(struct drm_device *dev); | 677 | extern void intel_display_handle_reset(struct drm_device *dev); |
678 | extern void hsw_disable_lcpll(struct drm_i915_private *dev_priv, | ||
679 | bool switch_to_fclk, bool allow_power_down); | ||
680 | extern void hsw_restore_lcpll(struct drm_i915_private *dev_priv); | ||
681 | extern void hsw_enable_pc8_work(struct work_struct *__work); | 678 | extern void hsw_enable_pc8_work(struct work_struct *__work); |
682 | extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); | 679 | extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); |
683 | extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); | 680 | extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); |