From: Daniel Vetter Date: Mon, 3 Nov 2014 14:04:55 +0000 (+0100) Subject: drm/i915: Move pll state commit into intel_modeset_update_state X-Git-Tag: firefly_0821_release~176^2~2672^2~64^2~75 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba41c0dec7786ca2d5f630d0f364c5f5331b34c1;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index be596178dca4..a05a8573f1a3 100644 --- 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);