drm/i915: Rename intel_shared_dpll->mode_set() to prepare()

The hook is called from intel_prepare_shared_dpll(). The name doesn't
make sense after all the changes to modeset code. So just call it
prepare.
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarDurgadoss R <durgadoss.r@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1483024933-3726-5-git-send-email-ander.conselvan.de.oliveira@intel.com
parent 2c42e535
...@@ -112,7 +112,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc) ...@@ -112,7 +112,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc)
WARN_ON(pll->on); WARN_ON(pll->on);
assert_shared_dpll_disabled(dev_priv, pll); assert_shared_dpll_disabled(dev_priv, pll);
pll->funcs.mode_set(dev_priv, pll); pll->funcs.prepare(dev_priv, pll);
} }
mutex_unlock(&dev_priv->dpll_lock); mutex_unlock(&dev_priv->dpll_lock);
} }
...@@ -306,8 +306,8 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv, ...@@ -306,8 +306,8 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv,
return val & DPLL_VCO_ENABLE; return val & DPLL_VCO_ENABLE;
} }
static void ibx_pch_dpll_mode_set(struct drm_i915_private *dev_priv, static void ibx_pch_dpll_prepare(struct drm_i915_private *dev_priv,
struct intel_shared_dpll *pll) struct intel_shared_dpll *pll)
{ {
I915_WRITE(PCH_FP0(pll->id), pll->state.hw_state.fp0); I915_WRITE(PCH_FP0(pll->id), pll->state.hw_state.fp0);
I915_WRITE(PCH_FP1(pll->id), pll->state.hw_state.fp1); I915_WRITE(PCH_FP1(pll->id), pll->state.hw_state.fp1);
...@@ -396,7 +396,7 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, ...@@ -396,7 +396,7 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
} }
static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = { static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = {
.mode_set = ibx_pch_dpll_mode_set, .prepare = ibx_pch_dpll_prepare,
.enable = ibx_pch_dpll_enable, .enable = ibx_pch_dpll_enable,
.disable = ibx_pch_dpll_disable, .disable = ibx_pch_dpll_disable,
.get_hw_state = ibx_pch_dpll_get_hw_state, .get_hw_state = ibx_pch_dpll_get_hw_state,
......
...@@ -101,8 +101,8 @@ struct intel_shared_dpll_state { ...@@ -101,8 +101,8 @@ struct intel_shared_dpll_state {
struct intel_shared_dpll_funcs { struct intel_shared_dpll_funcs {
/* The mode_set hook is optional and should be used together with the /* The mode_set hook is optional and should be used together with the
* intel_prepare_shared_dpll function. */ * intel_prepare_shared_dpll function. */
void (*mode_set)(struct drm_i915_private *dev_priv, void (*prepare)(struct drm_i915_private *dev_priv,
struct intel_shared_dpll *pll); struct intel_shared_dpll *pll);
void (*enable)(struct drm_i915_private *dev_priv, void (*enable)(struct drm_i915_private *dev_priv,
struct intel_shared_dpll *pll); struct intel_shared_dpll *pll);
void (*disable)(struct drm_i915_private *dev_priv, void (*disable)(struct drm_i915_private *dev_priv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment