diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-24 17:55:14 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-20 09:19:36 -0400 |
commit | 85b3894f7997d98939c33ca769e30d89e9f0bf27 (patch) | |
tree | 5705582d95caeb5cd7ff50271ee103df39f636a4 /drivers/gpu/drm/i915/intel_display.c | |
parent | b14b105586dc3a8221f282220da1d47bb8a85c5b (diff) |
drm/i915: s/ironlake_/intel_ for the enable_share_dpll function
Besides the fairly useless BUG_ON the logic is completely generic
and cane be used on any platform what wants to reuse the shared
dpll support code.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7def8dd0e8a8..00a214a9d18f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1756,21 +1756,19 @@ static void intel_prepare_shared_dpll(struct intel_crtc *crtc) | |||
1756 | } | 1756 | } |
1757 | 1757 | ||
1758 | /** | 1758 | /** |
1759 | * ironlake_enable_shared_dpll - enable PCH PLL | 1759 | * intel_enable_shared_dpll - enable PCH PLL |
1760 | * @dev_priv: i915 private structure | 1760 | * @dev_priv: i915 private structure |
1761 | * @pipe: pipe PLL to enable | 1761 | * @pipe: pipe PLL to enable |
1762 | * | 1762 | * |
1763 | * The PCH PLL needs to be enabled before the PCH transcoder, since it | 1763 | * The PCH PLL needs to be enabled before the PCH transcoder, since it |
1764 | * drives the transcoder clock. | 1764 | * drives the transcoder clock. |
1765 | */ | 1765 | */ |
1766 | static void ironlake_enable_shared_dpll(struct intel_crtc *crtc) | 1766 | static void intel_enable_shared_dpll(struct intel_crtc *crtc) |
1767 | { | 1767 | { |
1768 | struct drm_device *dev = crtc->base.dev; | 1768 | struct drm_device *dev = crtc->base.dev; |
1769 | struct drm_i915_private *dev_priv = dev->dev_private; | 1769 | struct drm_i915_private *dev_priv = dev->dev_private; |
1770 | struct intel_shared_dpll *pll = intel_crtc_to_shared_dpll(crtc); | 1770 | struct intel_shared_dpll *pll = intel_crtc_to_shared_dpll(crtc); |
1771 | 1771 | ||
1772 | /* PCH PLLs only available on ILK, SNB and IVB */ | ||
1773 | BUG_ON(INTEL_INFO(dev)->gen < 5); | ||
1774 | if (WARN_ON(pll == NULL)) | 1772 | if (WARN_ON(pll == NULL)) |
1775 | return; | 1773 | return; |
1776 | 1774 | ||
@@ -3514,7 +3512,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) | |||
3514 | * Note that enable_shared_dpll tries to do the right thing, but | 3512 | * Note that enable_shared_dpll tries to do the right thing, but |
3515 | * get_shared_dpll unconditionally resets the pll - we need that to have | 3513 | * get_shared_dpll unconditionally resets the pll - we need that to have |
3516 | * the right LVDS enable sequence. */ | 3514 | * the right LVDS enable sequence. */ |
3517 | ironlake_enable_shared_dpll(intel_crtc); | 3515 | intel_enable_shared_dpll(intel_crtc); |
3518 | 3516 | ||
3519 | /* set transcoder timing, panel must allow it */ | 3517 | /* set transcoder timing, panel must allow it */ |
3520 | assert_panel_unlocked(dev_priv, pipe); | 3518 | assert_panel_unlocked(dev_priv, pipe); |