diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-12 21:14:36 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-04-15 15:25:27 +0200 |
| commit | 062efa5d841cca5e0df5b45c624966cb9936438c (patch) | |
| tree | 3cd46bfab1068b98a1fa51ce246347461c9666f2 | |
| parent | drm/i915: Compute DSI PLL parameters during .compute_config() (diff) | |
| download | linux-062efa5d841cca5e0df5b45c624966cb9936438c.tar.xz linux-062efa5d841cca5e0df5b45c624966cb9936438c.zip | |
drm/i915: Eliminate {vlv,bxt}_configure_dsi_pll()
Fold the DSI PLL configuration functions into the DSI PLL
enable functions since they are small and not called from anywhere else.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460488478-18311-4-git-send-email-ville.syrjala@linux.intel.com
Tested-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dsi_pll.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c index 115f59646514..1765e6e18f2c 100644 --- a/drivers/gpu/drm/i915/intel_dsi_pll.c +++ b/drivers/gpu/drm/i915/intel_dsi_pll.c @@ -141,17 +141,6 @@ static int vlv_compute_dsi_pll(struct intel_encoder *encoder, return 0; } -static void vlv_configure_dsi_pll(struct intel_encoder *encoder, - const struct intel_crtc_state *config) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_CONTROL, 0); - vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_DIVIDER, config->dsi_pll.div); - vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_CONTROL, - config->dsi_pll.ctrl & ~DSI_PLL_VCO_EN); -} - static void vlv_enable_dsi_pll(struct intel_encoder *encoder, const struct intel_crtc_state *config) { @@ -161,7 +150,10 @@ static void vlv_enable_dsi_pll(struct intel_encoder *encoder, mutex_lock(&dev_priv->sb_lock); - vlv_configure_dsi_pll(encoder, config); + vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_CONTROL, 0); + vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_DIVIDER, config->dsi_pll.div); + vlv_cck_write(dev_priv, CCK_REG_DSI_PLL_CONTROL, + config->dsi_pll.ctrl & ~DSI_PLL_VCO_EN); /* wait at least 0.5 us after ungating before enabling VCO */ usleep_range(1, 10); @@ -470,15 +462,6 @@ static int bxt_compute_dsi_pll(struct intel_encoder *encoder, return 0; } -static void bxt_configure_dsi_pll(struct intel_encoder *encoder, - const struct intel_crtc_state *config) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - I915_WRITE(BXT_DSI_PLL_CTL, config->dsi_pll.ctrl); - POSTING_READ(BXT_DSI_PLL_CTL); -} - static void bxt_enable_dsi_pll(struct intel_encoder *encoder, const struct intel_crtc_state *config) { @@ -490,7 +473,8 @@ static void bxt_enable_dsi_pll(struct intel_encoder *encoder, DRM_DEBUG_KMS("\n"); /* Configure PLL vales */ - bxt_configure_dsi_pll(encoder, config); + I915_WRITE(BXT_DSI_PLL_CTL, config->dsi_pll.ctrl); + POSTING_READ(BXT_DSI_PLL_CTL); /* Program TX, RX, Dphy clocks */ for_each_dsi_port(port, intel_dsi->ports) |