[PATCH 3/8] drm/i915/cdclk: Only compute squash waveform when necessary

[Gustavo Sousa]

It is no use computing the squash waveform if we are not going to use
it. Move the call to cdclk_squash_waveform() inside the block guarded by
HAS_CDCLK_SQUASH(dev_priv).

Signed-off-by: Gustavo Sousa <gustavo.so...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c 
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index bf84bf27213f..cdf3ae766f9e 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -2023,10 +2023,11 @@ static void _bxt_set_cdclk(struct drm_i915_private 
*dev_priv,
        } else
                bxt_cdclk_pll_update(dev_priv, vco);
 
-       waveform = cdclk_squash_waveform(dev_priv, cdclk);
+       if (HAS_CDCLK_SQUASH(dev_priv)) {
+               waveform = cdclk_squash_waveform(dev_priv, cdclk);
 
-       if (HAS_CDCLK_SQUASH(dev_priv))
                dg2_cdclk_squash_program(dev_priv, waveform);
+       }
 
        intel_de_write(dev_priv, CDCLK_CTL, bxt_cdclk_ctl(dev_priv, 
cdclk_config, pipe));
 
-- 
2.44.0