Commit ba41c0de authored by Daniel Vetter's avatar Daniel Vetter

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: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent e9f1af39
...@@ -10231,10 +10231,13 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc) ...@@ -10231,10 +10231,13 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc)
static void static void
intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes) 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_encoder *intel_encoder;
struct intel_crtc *intel_crtc; struct intel_crtc *intel_crtc;
struct drm_connector *connector; struct drm_connector *connector;
intel_shared_dpll_commit(dev_priv);
for_each_intel_encoder(dev, intel_encoder) { for_each_intel_encoder(dev, intel_encoder) {
if (!intel_encoder->base.crtc) if (!intel_encoder->base.crtc)
continue; continue;
...@@ -10838,9 +10841,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, ...@@ -10838,9 +10841,6 @@ static int __intel_set_mode(struct drm_crtc *crtc,
&pipe_config->adjusted_mode); &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 /* Only after disabling all output pipelines that will be changed can we
* update the the output configuration. */ * update the the output configuration. */
intel_modeset_update_state(dev, prepare_pipes); intel_modeset_update_state(dev, prepare_pipes);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment