On Mon, 2016-02-29 at 13:52 +0100, Maarten Lankhorst wrote:
> Warn for the wrong mask in enable only. Disable will have the wrong mask now
> because the new state is committed before disabling the old state.
Why do we want to perform dpll commit first? That should be in the commit
message.
With that and what Durga said:
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@xxxxxxxxx>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 5dd59cae9f06..6e3b8a1f7dd3 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1893,7 +1893,7 @@ static void intel_enable_shared_dpll(struct intel_crtc
> *crtc)
> if (WARN_ON(pll == NULL))
> return;
>
> - if (WARN_ON(pll->config.crtc_mask == 0))
> + if (WARN_ON(!(pll->config.crtc_mask & (1 << drm_crtc_index(&crtc
> ->base)))))
> return;
>
> if (WARN_ON(pll->active_mask & crtc_mask))
> @@ -1933,9 +1933,6 @@ static void intel_disable_shared_dpll(struct intel_crtc
> *crtc)
> if (pll == NULL)
> return;
>
> - if (WARN_ON(!(pll->config.crtc_mask & crtc_mask)))
> - return;
> -
> if (WARN_ON(!(pll->active_mask & crtc_mask)))
> return;
>
> @@ -13521,7 +13518,8 @@ static int intel_atomic_commit(struct drm_device *dev,
> }
>
> drm_atomic_helper_swap_state(dev, state);
> - dev_priv->wm.config = to_intel_atomic_state(state)->wm_config;
> + dev_priv->wm.config = intel_state->wm_config;
> + intel_shared_dpll_commit(state);
>
> if (intel_state->modeset) {
> memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
> @@ -13573,8 +13571,6 @@ static int intel_atomic_commit(struct drm_device *dev,
> intel_modeset_update_crtc_state(state);
>
> if (intel_state->modeset) {
> - intel_shared_dpll_commit(state);
> -
> drm_atomic_helper_update_legacy_modeset_state(state->dev,
> state);
>
> if (dev_priv->display.modeset_commit_cdclk &&
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
