aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8d270f7650de..7b5add5e9fd9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13994,8 +13994,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
13994 13994
13995 DRM_DEBUG_KMS("New cdclk calculated to be atomic %u, actual %u\n", 13995 DRM_DEBUG_KMS("New cdclk calculated to be atomic %u, actual %u\n",
13996 intel_state->cdclk, intel_state->dev_cdclk); 13996 intel_state->cdclk, intel_state->dev_cdclk);
13997 } else 13997 } else {
13998 to_intel_atomic_state(state)->cdclk = dev_priv->atomic_cdclk_freq; 13998 to_intel_atomic_state(state)->cdclk = dev_priv->atomic_cdclk_freq;
13999 }
13999 14000
14000 intel_modeset_clear_plls(state); 14001 intel_modeset_clear_plls(state);
14001 14002
@@ -14096,8 +14097,9 @@ static int intel_atomic_check(struct drm_device *dev,
14096 14097
14097 if (ret) 14098 if (ret)
14098 return ret; 14099 return ret;
14099 } else 14100 } else {
14100 intel_state->cdclk = dev_priv->cdclk_freq; 14101 intel_state->cdclk = dev_priv->atomic_cdclk_freq;
14102 }
14101 14103
14102 ret = drm_atomic_helper_check_planes(dev, state); 14104 ret = drm_atomic_helper_check_planes(dev, state);
14103 if (ret) 14105 if (ret)