Re: [PATCH 4/7] drm/i915: Rename intel_shared_dpll->mode_set() to prepare()

Daniel Vetter
2016-10-13T13:26:34Z

On Tue, Oct 04, 2016 at 03:32:14PM +0300, Ander Conselvan de Oliveira wrote:
> 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: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Reviewed-by: Durgadoss R <durgadoss.r@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
> drivers/gpu/drm/i915/intel_dpll_mgr.c | 8 ++++----
> drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index c88fc07..9446446 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -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);
> }
> @@ -302,8 +302,8 @@ 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,
> - struct intel_shared_dpll *pll)
> +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);
> I915_WRITE(PCH_FP1(pll->id), pll->state.hw_state.fp1);
> @@ -392,7 +392,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,
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/intel_dpll_mgr.h
> index 6e3a0f1..9a7db65 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.h
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.h
> @@ -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);
> --
> 2.5.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation