On Thu, 20 Oct 2022, Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> wrote: > No functional change. Introduce dg2_cdclk_squash_programming and > move squash_ctl register programming bits to this. > > Cc: Balasubramani Vivekanandan <balasubramani.vivekanandan@xxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 23 +++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c > index 8701796788e3..b692186c8f02 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -1705,6 +1705,18 @@ static void bxt_cdclk_pll(struct drm_i915_private *i915, int vco) > > } > > +static void dg2_cdclk_squash_programming(struct drm_i915_private *i915, > + u16 waveform) Function names that are verbs should preferrably use the imperative mood, i.e. program() instead of programmed(), programs() or programming(). I'm also not sure "programming" or "program" is a very descriptive thing; almost everything here is about "programming" something or other. BR, Jani. > +{ > + u32 squash_ctl = 0; > + > + if (waveform) > + squash_ctl = CDCLK_SQUASH_ENABLE | > + CDCLK_SQUASH_WINDOW_SIZE(0xf) | waveform; > + > + intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl); > +} > + > static void bxt_set_cdclk(struct drm_i915_private *dev_priv, > const struct intel_cdclk_config *cdclk_config, > enum pipe pipe) > @@ -1752,15 +1764,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, > else > clock = cdclk; > > - if (HAS_CDCLK_SQUASH(dev_priv)) { > - u32 squash_ctl = 0; > - > - if (waveform) > - squash_ctl = CDCLK_SQUASH_ENABLE | > - CDCLK_SQUASH_WINDOW_SIZE(0xf) | waveform; > - > - intel_de_write(dev_priv, CDCLK_SQUASH_CTL, squash_ctl); > - } > + if (HAS_CDCLK_SQUASH(dev_priv)) > + dg2_cdclk_squash_programming(dev_priv, waveform); > > val = bxt_cdclk_cd2x_div_sel(dev_priv, clock, vco) | > bxt_cdclk_cd2x_pipe(dev_priv, pipe) | -- Jani Nikula, Intel Open Source Graphics Center