diff options
| author | Ville Syrjälä <[email protected]> | 2016-05-13 23:41:36 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2016-05-23 21:11:16 +0300 |
| commit | 089c6fd503b050eb9996e02e8675dfabb48e51e8 (patch) | |
| tree | 4b5dc2f16b1f6ceed3b310118977159942141099 | |
| parent | 83d7c81f6a6a28b7c3f3512b1d09d37593aaa43b (diff) | |
drm/i915: Update cached cdclk state from broxton_init_cdclk()
Let's make sure our cached cdclk state is accurate right after
broxton_init_cdclk() whether or not we end up changing the cdclk
frequency.
Signed-off-by: Ville Syrjälä <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Imre Deak <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6382241cb787..4dfeb6ebc015 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5428,13 +5428,10 @@ bool broxton_cdclk_verify_state(struct drm_i915_private *dev_priv) void broxton_init_cdclk(struct drm_i915_private *dev_priv) { - /* check if cd clock is enabled */ - if (broxton_cdclk_is_enabled(dev_priv)) { - DRM_DEBUG_KMS("CDCLK already enabled, won't reprogram it\n"); - return; - } + intel_update_cdclk(dev_priv->dev); - DRM_DEBUG_KMS("CDCLK not enabled, enabling it\n"); + if (dev_priv->cdclk_pll.vco != 0) + return; /* * FIXME: |