On Fri, 09 May 2025, Suraj Kandpal <[email protected]> wrote: > Rename intel_dpll_funcs to intel_dpll_global_funcs so that later > on intel_shared_dpll_funcs can be renamed to intel_dpll_funcs. > This is done to move away from the shared naming convention since > starting MTL dpll's are not shared among PHYs. > > Signed-off-by: Suraj Kandpal <[email protected]>
My gut feeling is that the whole dpll and shared dpll distinction was a mistake, and we should just have one dpll framework. But let's see where this goes. Reviewed-by: Jani Nikula <[email protected]> > --- > .../gpu/drm/i915/display/intel_display_core.h | 4 ++-- > drivers/gpu/drm/i915/display/intel_dpll.c | 22 +++++++++---------- > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h > b/drivers/gpu/drm/i915/display/intel_display_core.h > index 6fc213f84e73..e0221e514326 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_core.h > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h > @@ -42,7 +42,7 @@ struct intel_color_funcs; > struct intel_crtc; > struct intel_crtc_state; > struct intel_dmc; > -struct intel_dpll_funcs; > +struct intel_dpll_global_funcs; > struct intel_dpll_mgr; > struct intel_fbdev; > struct intel_fdi_funcs; > @@ -300,7 +300,7 @@ struct intel_display { > const struct intel_cdclk_funcs *cdclk; > > /* Display pll funcs */ > - const struct intel_dpll_funcs *dpll; > + const struct intel_dpll_global_funcs *dpll; > > /* irq display functions */ > const struct intel_hotplug_funcs *hotplug; > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c > b/drivers/gpu/drm/i915/display/intel_dpll.c > index a9e9b98d0bf9..8db603d9c823 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > @@ -24,7 +24,7 @@ > #include "vlv_dpio_phy_regs.h" > #include "vlv_sideband.h" > > -struct intel_dpll_funcs { > +struct intel_dpll_global_funcs { > int (*crtc_compute_clock)(struct intel_atomic_state *state, > struct intel_crtc *crtc); > int (*crtc_get_shared_dpll)(struct intel_atomic_state *state, > @@ -1690,45 +1690,45 @@ static int i8xx_crtc_compute_clock(struct > intel_atomic_state *state, > return 0; > } > > -static const struct intel_dpll_funcs mtl_dpll_funcs = { > +static const struct intel_dpll_global_funcs mtl_dpll_funcs = { > .crtc_compute_clock = mtl_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs dg2_dpll_funcs = { > +static const struct intel_dpll_global_funcs dg2_dpll_funcs = { > .crtc_compute_clock = dg2_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs hsw_dpll_funcs = { > +static const struct intel_dpll_global_funcs hsw_dpll_funcs = { > .crtc_compute_clock = hsw_crtc_compute_clock, > .crtc_get_shared_dpll = hsw_crtc_get_shared_dpll, > }; > > -static const struct intel_dpll_funcs ilk_dpll_funcs = { > +static const struct intel_dpll_global_funcs ilk_dpll_funcs = { > .crtc_compute_clock = ilk_crtc_compute_clock, > .crtc_get_shared_dpll = ilk_crtc_get_shared_dpll, > }; > > -static const struct intel_dpll_funcs chv_dpll_funcs = { > +static const struct intel_dpll_global_funcs chv_dpll_funcs = { > .crtc_compute_clock = chv_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs vlv_dpll_funcs = { > +static const struct intel_dpll_global_funcs vlv_dpll_funcs = { > .crtc_compute_clock = vlv_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs g4x_dpll_funcs = { > +static const struct intel_dpll_global_funcs g4x_dpll_funcs = { > .crtc_compute_clock = g4x_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs pnv_dpll_funcs = { > +static const struct intel_dpll_global_funcs pnv_dpll_funcs = { > .crtc_compute_clock = pnv_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs i9xx_dpll_funcs = { > +static const struct intel_dpll_global_funcs i9xx_dpll_funcs = { > .crtc_compute_clock = i9xx_crtc_compute_clock, > }; > > -static const struct intel_dpll_funcs i8xx_dpll_funcs = { > +static const struct intel_dpll_global_funcs i8xx_dpll_funcs = { > .crtc_compute_clock = i8xx_crtc_compute_clock, > }; -- Jani Nikula, Intel
