drm/i915: Move pll state commit into intel_modeset_update_state

It's really part of the "push all new_* state into current state
pointers" done in that function. So let's move it there to make this
clear.

Also, with the conversion done the num_shared_dpll check the function
does in it's loop is enough, so we can drop the check for the dpll
compute callback, too.

Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index be596178dca4fd4078d66156993f64d11f9cc94e..a05a8573f1a37eb104bdff359a2bad66ef015b32 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10231,10 +10231,13 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc)
 static void
 intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes)
 {
+       struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_encoder *intel_encoder;
        struct intel_crtc *intel_crtc;
        struct drm_connector *connector;
 
+       intel_shared_dpll_commit(dev_priv);
+
        for_each_intel_encoder(dev, intel_encoder) {
                if (!intel_encoder->base.crtc)
                        continue;
@@ -10838,9 +10841,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,
                                                &pipe_config->adjusted_mode);
        }
 
-       if (dev_priv->display.crtc_compute_clock)
-               intel_shared_dpll_commit(dev_priv);
-
        /* Only after disabling all output pipelines that will be changed can we
         * update the the output configuration. */
        intel_modeset_update_state(dev, prepare_pipes);