|
@@ -14369,14 +14369,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
|
|
|
|
|
|
drm_atomic_helper_wait_for_dependencies(state);
|
|
|
|
|
|
- if (intel_state->modeset) {
|
|
|
- memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
|
|
|
- sizeof(intel_state->min_pixclk));
|
|
|
- dev_priv->active_crtcs = intel_state->active_crtcs;
|
|
|
- dev_priv->atomic_cdclk_freq = intel_state->cdclk;
|
|
|
-
|
|
|
+ if (intel_state->modeset)
|
|
|
intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET);
|
|
|
- }
|
|
|
|
|
|
for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
|
@@ -14609,6 +14603,13 @@ static int intel_atomic_commit(struct drm_device *dev,
|
|
|
intel_shared_dpll_commit(state);
|
|
|
intel_atomic_track_fbs(state);
|
|
|
|
|
|
+ if (intel_state->modeset) {
|
|
|
+ memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
|
|
|
+ sizeof(intel_state->min_pixclk));
|
|
|
+ dev_priv->active_crtcs = intel_state->active_crtcs;
|
|
|
+ dev_priv->atomic_cdclk_freq = intel_state->cdclk;
|
|
|
+ }
|
|
|
+
|
|
|
drm_atomic_state_get(state);
|
|
|
INIT_WORK(&state->commit_work,
|
|
|
nonblock ? intel_atomic_commit_work : NULL);
|