[PATCH 03/16] drm/i915/dpll: Rename intel_shared_dpll_funcs

[Kandpal, Suraj]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula at intel.com>
> Sent: Thursday, April 3, 2025 8:29 PM
> To: Kandpal, Suraj <suraj.kandpal at intel.com>; intel-xe at lists.freedesktop.org;
> intel-gfx at lists.freedesktop.org
> Cc: Nautiyal, Ankit K <ankit.k.nautiyal at intel.com>; Shankar, Uma
> <uma.shankar at intel.com>; Kahola, Mika <mika.kahola at intel.com>; Syrjala,
> Ville <ville.syrjala at intel.com>; Kandpal, Suraj <suraj.kandpal at intel.com>
> Subject: Re: [PATCH 03/16] drm/i915/dpll: Rename intel_shared_dpll_funcs
> 
> On Wed, 02 Apr 2025, Suraj Kandpal <suraj.kandpal at intel.com> wrote:
> > Rename intel_shared_dpll_funcs to intel_global_dpll_funcs since it
> > needs to represent both shared and individual dplls.
> >
> > --v2
> > -Change intel_global_dpll to intel_dpll_global to be more in line with
> > the naming standard where the name should start with the file name
> > [Jani]
> 
> Though I'm not sure what we need the "global" for. Just intel_dpll_funcs?

Reason being intel_dpll_funcs already exist

Regards,
Suraj Kandpal

> 
> >
> > Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 24
> > +++++++++----------  drivers/gpu/drm/i915/display/intel_dpll_mgr.h |
> > 4 ++--
> >  2 files changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > index bbb51119ef5b..92ca2a544e2f 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > @@ -61,7 +61,7 @@
> >   */
> >
> >  /* platform specific hooks for managing DPLLs */ -struct
> > intel_shared_dpll_funcs {
> > +struct intel_dpll_global_funcs {
> >  	/*
> >  	 * Hook for enabling the pll, called from intel_enable_shared_dpll() if
> >  	 * the pll is not already enabled.
> > @@ -668,7 +668,7 @@ static bool ibx_compare_hw_state(const struct
> intel_dpll_hw_state *_a,
> >  		a->fp1 == b->fp1;
> >  }
> >
> > -static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = {
> > +static const struct intel_dpll_global_funcs ibx_pch_dpll_funcs = {
> >  	.enable = ibx_pch_dpll_enable,
> >  	.disable = ibx_pch_dpll_disable,
> >  	.get_hw_state = ibx_pch_dpll_get_hw_state, @@ -1268,14 +1268,14
> @@
> > static bool hsw_compare_hw_state(const struct intel_dpll_hw_state *_a,
> >  		a->spll == b->spll;
> >  }
> >
> > -static const struct intel_shared_dpll_funcs hsw_ddi_wrpll_funcs = {
> > +static const struct intel_dpll_global_funcs hsw_ddi_wrpll_funcs = {
> >  	.enable = hsw_ddi_wrpll_enable,
> >  	.disable = hsw_ddi_wrpll_disable,
> >  	.get_hw_state = hsw_ddi_wrpll_get_hw_state,
> >  	.get_freq = hsw_ddi_wrpll_get_freq,
> >  };
> >
> > -static const struct intel_shared_dpll_funcs hsw_ddi_spll_funcs = {
> > +static const struct intel_dpll_global_funcs hsw_ddi_spll_funcs = {
> >  	.enable = hsw_ddi_spll_enable,
> >  	.disable = hsw_ddi_spll_disable,
> >  	.get_hw_state = hsw_ddi_spll_get_hw_state, @@ -1300,7 +1300,7 @@
> > static bool hsw_ddi_lcpll_get_hw_state(struct intel_display *display,
> >  	return true;
> >  }
> >
> > -static const struct intel_shared_dpll_funcs hsw_ddi_lcpll_funcs = {
> > +static const struct intel_dpll_global_funcs hsw_ddi_lcpll_funcs = {
> >  	.enable = hsw_ddi_lcpll_enable,
> >  	.disable = hsw_ddi_lcpll_disable,
> >  	.get_hw_state = hsw_ddi_lcpll_get_hw_state, @@ -2002,14 +2002,14
> @@
> > static bool skl_compare_hw_state(const struct intel_dpll_hw_state *_a,
> >  		a->cfgcr2 == b->cfgcr2;
> >  }
> >
> > -static const struct intel_shared_dpll_funcs skl_ddi_pll_funcs = {
> > +static const struct intel_dpll_global_funcs skl_ddi_pll_funcs = {
> >  	.enable = skl_ddi_pll_enable,
> >  	.disable = skl_ddi_pll_disable,
> >  	.get_hw_state = skl_ddi_pll_get_hw_state,
> >  	.get_freq = skl_ddi_pll_get_freq,
> >  };
> >
> > -static const struct intel_shared_dpll_funcs skl_ddi_dpll0_funcs = {
> > +static const struct intel_dpll_global_funcs skl_ddi_dpll0_funcs = {
> >  	.enable = skl_ddi_dpll0_enable,
> >  	.disable = skl_ddi_dpll0_disable,
> >  	.get_hw_state = skl_ddi_dpll0_get_hw_state, @@ -2484,7 +2484,7
> @@
> > static bool bxt_compare_hw_state(const struct intel_dpll_hw_state *_a,
> >  		a->pcsdw12 == b->pcsdw12;
> >  }
> >
> > -static const struct intel_shared_dpll_funcs bxt_ddi_pll_funcs = {
> > +static const struct intel_dpll_global_funcs bxt_ddi_pll_funcs = {
> >  	.enable = bxt_ddi_pll_enable,
> >  	.disable = bxt_ddi_pll_disable,
> >  	.get_hw_state = bxt_ddi_pll_get_hw_state, @@ -4129,21 +4129,21
> @@
> > static bool icl_compare_hw_state(const struct intel_dpll_hw_state *_a,
> >  		a->mg_pll_tdc_coldst_bias == b->mg_pll_tdc_coldst_bias;  }
> >
> > -static const struct intel_shared_dpll_funcs combo_pll_funcs = {
> > +static const struct intel_dpll_global_funcs combo_pll_funcs = {
> >  	.enable = combo_pll_enable,
> >  	.disable = combo_pll_disable,
> >  	.get_hw_state = combo_pll_get_hw_state,
> >  	.get_freq = icl_ddi_combo_pll_get_freq,  };
> >
> > -static const struct intel_shared_dpll_funcs tbt_pll_funcs = {
> > +static const struct intel_dpll_global_funcs tbt_pll_funcs = {
> >  	.enable = tbt_pll_enable,
> >  	.disable = tbt_pll_disable,
> >  	.get_hw_state = tbt_pll_get_hw_state,
> >  	.get_freq = icl_ddi_tbt_pll_get_freq,  };
> >
> > -static const struct intel_shared_dpll_funcs mg_pll_funcs = {
> > +static const struct intel_dpll_global_funcs mg_pll_funcs = {
> >  	.enable = mg_pll_enable,
> >  	.disable = mg_pll_disable,
> >  	.get_hw_state = mg_pll_get_hw_state, @@ -4191,7 +4191,7 @@ static
> > const struct intel_dpll_mgr ehl_pll_mgr = {
> >  	.compare_hw_state = icl_compare_hw_state,  };
> >
> > -static const struct intel_shared_dpll_funcs dkl_pll_funcs = {
> > +static const struct intel_dpll_global_funcs dkl_pll_funcs = {
> >  	.enable = mg_pll_enable,
> >  	.disable = mg_pll_disable,
> >  	.get_hw_state = dkl_pll_get_hw_state, diff --git
> > a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > index d93072486831..2080118be523 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > @@ -41,7 +41,7 @@ struct intel_crtc;
> >  struct intel_crtc_state;
> >  struct intel_encoder;
> >  struct intel_shared_dpll;
> > -struct intel_shared_dpll_funcs;
> > +struct intel_dpll_global_funcs;
> >
> >  /**
> >   * enum intel_dpll_id - possible DPLL ids @@ -314,7 +314,7 @@ struct
> > dpll_info {
> >  	/**
> >  	 * @funcs: platform specific hooks
> >  	 */
> > -	const struct intel_shared_dpll_funcs *funcs;
> > +	const struct intel_dpll_global_funcs *funcs;
> >
> >  	/**
> >  	 * @id: unique identifier for this DPLL
> 
> --
> Jani Nikula, Intel