Commit 6688b6b1 authored by Anusha Srivatsa's avatar Anusha Srivatsa
Browse files

drm/i915/display: Move chunks of code out of bxt_set_cdclk() 



No functional change. Moving segments out to simplify
bxt_set_cdlck()

v2: s/bxt_cdclk_pll/bxt_cdclk_pll_update (Jani)

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarBalasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221025223042.138810-3-anusha.srivatsa@intel.com
parent 1d32f5d6

drivers/gpu/drm/i915/display/intel_cdclk.c

+24 −15
Original line number Diff line number Diff line
@@ -1684,6 +1684,26 @@ static u32 cdclk_squash_waveform(struct drm_i915_private *dev_priv, 
	return 0xffff;

}



static void icl_cdclk_pll_update(struct drm_i915_private *i915, int vco)

{

	if (i915->display.cdclk.hw.vco != 0 &&

	    i915->display.cdclk.hw.vco != vco)

		icl_cdclk_pll_disable(i915);



	if (i915->display.cdclk.hw.vco != vco)

		icl_cdclk_pll_enable(i915, vco);

}



static void bxt_cdclk_pll_update(struct drm_i915_private *i915, int vco)

{

	if (i915->display.cdclk.hw.vco != 0 &&

	    i915->display.cdclk.hw.vco != vco)

		bxt_de_pll_disable(i915);



	if (i915->display.cdclk.hw.vco != vco)

		bxt_de_pll_enable(i915, vco);

}



static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

			  const struct intel_cdclk_config *cdclk_config,

			  enum pipe pipe)
@@ -1719,21 +1739,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, 
	if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco > 0 && vco > 0) {

		if (dev_priv->display.cdclk.hw.vco != vco)

			adlp_cdclk_pll_crawl(dev_priv, vco);

	} else if (DISPLAY_VER(dev_priv) >= 11) {

		if (dev_priv->display.cdclk.hw.vco != 0 &&

		    dev_priv->display.cdclk.hw.vco != vco)

			icl_cdclk_pll_disable(dev_priv);



		if (dev_priv->display.cdclk.hw.vco != vco)

			icl_cdclk_pll_enable(dev_priv, vco);

	} else {

		if (dev_priv->display.cdclk.hw.vco != 0 &&

		    dev_priv->display.cdclk.hw.vco != vco)

			bxt_de_pll_disable(dev_priv);



		if (dev_priv->display.cdclk.hw.vco != vco)

			bxt_de_pll_enable(dev_priv, vco);

	}

	} else if (DISPLAY_VER(dev_priv) >= 11)

		icl_cdclk_pll_update(dev_priv, vco);

	else

		bxt_cdclk_pll_update(dev_priv, vco);



	waveform = cdclk_squash_waveform(dev_priv, cdclk);