On Fri, Feb 05, 2021 at 05:09:14PM +0200, Ville Syrjälä wrote: > On Fri, Feb 05, 2021 at 04:48:43PM +0200, Jani Nikula wrote: > > From: Dave Airlie <airlied@xxxxxxxxxx> > > > > This just migrates the hsw+ code to a better place. > > > > Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx> > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 219 +---------------- > > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 223 ++++++++++++++++++ > > drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 + > > 3 files changed, 226 insertions(+), 218 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index beed08c00b6c..f7c1f036d38f 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -6520,212 +6520,6 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc, > > return ret; > > } > > > > -static void dg1_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port, > > - struct intel_crtc_state *pipe_config) > > -{ > > - enum icl_port_dpll_id port_dpll_id = ICL_PORT_DPLL_DEFAULT; > > - enum phy phy = intel_port_to_phy(dev_priv, port); > > - struct icl_port_dpll *port_dpll; > > - struct intel_shared_dpll *pll; > > - enum intel_dpll_id id; > > - bool pll_active; > > - u32 clk_sel; > > - > > - clk_sel = intel_de_read(dev_priv, DG1_DPCLKA_CFGCR0(phy)) & DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy); > > - id = DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_DPLL_MAP(clk_sel, phy); > > Hmm. Since this mostly about DPCLKA_CFGCR/PORT_CLK_SEL/etc. > I think intel_ddi.c would the more approriate place, especially > when considering my recent DDI clock routing refactoring. > I guess we could even consider intel_ddi_clock.c or > somesuch to stuff all of it into. Now I'm also tempted > to turn this stuff into vfuncs as well, to partner up > with the new encoder->{enable,disable}_clock(). Temptation turned into code. I think I have a decent way forward with this idea on top of my other refactorings, so I'd just drop this patch. -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx