diff options
| author | Damien Lespiau | 2014-07-29 19:06:19 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-08 17:43:35 +0200 |
| commit | 143b307c43dcfeae41a3b6c24a29fae4c70884f4 (patch) | |
| tree | 093304c0dba0fa4fc4ad5681183b5eff58963209 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: Extract the HSW DDI selection code into its own function (diff) | |
| download | kernel-qcow2-linux-143b307c43dcfeae41a3b6c24a29fae4c70884f4.tar.gz kernel-qcow2-linux-143b307c43dcfeae41a3b6c24a29fae4c70884f4.tar.xz kernel-qcow2-linux-143b307c43dcfeae41a3b6c24a29fae4c70884f4.zip | |
drm/i915: Extract the HSW/BDW shared dpll init code
So we can easily provide an alternate implementation in the future.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 5db0b5552e39..ee7a74c6e93a 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1248,10 +1248,8 @@ static const char * const hsw_ddi_pll_names[] = { "WRPLL 2", }; -void intel_ddi_pll_init(struct drm_device *dev) +static void hsw_shared_dplls_init(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; - uint32_t val = I915_READ(LCPLL_CTL); int i; dev_priv->num_shared_dpll = 2; @@ -1264,6 +1262,14 @@ void intel_ddi_pll_init(struct drm_device *dev) dev_priv->shared_dplls[i].get_hw_state = hsw_ddi_pll_get_hw_state; } +} + +void intel_ddi_pll_init(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + uint32_t val = I915_READ(LCPLL_CTL); + + hsw_shared_dplls_init(dev_priv); /* The LCPLL register should be turned on by the BIOS. For now let's * just check its state and print errors in case something is wrong. |