Commit eac6176c authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

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

drivers/gpu/drm/i915/intel_dpll_mgr.c

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc) 
		WARN_ON(pll->on);

		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);

}
@@ -306,7 +306,7 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv, 
	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)

{

	I915_WRITE(PCH_FP0(pll->id), pll->state.hw_state.fp0);
@@ -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 = {

	.mode_set = ibx_pch_dpll_mode_set,

	.prepare = ibx_pch_dpll_prepare,

	.enable = ibx_pch_dpll_enable,

	.disable = ibx_pch_dpll_disable,

	.get_hw_state = ibx_pch_dpll_get_hw_state,

drivers/gpu/drm/i915/intel_dpll_mgr.h

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct intel_shared_dpll_state { 
struct intel_shared_dpll_funcs {

	/* The mode_set hook is optional and should be used together with the

	 * 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);

	void (*enable)(struct drm_i915_private *dev_priv,

		       struct intel_shared_dpll *pll);