[Intel-gfx] [PATCH v1] Revert "drm/i915: Update dbuf slices only with full modeset"

[Jani Nikula]

On Thu, 13 Feb 2020, Stanislav Lisovskiy <stanislav.lisovskiy at intel.com> wrote:
> Most likely that change is not needed and would be wrong
> to do, as we have already figured out the solution for regression.
> However to be on safe side, lets have this build as well.
>
> This reverts commit 85487cf4a1670bc2ba95238aaf9f8bf28dc9e7ac.

Please add a Fixes: line for reverts. If and when this gets pushed,
please add this:

Fixes: 85487cf4a167 ("drm/i915: Update dbuf slices only with full modeset")

>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 61ba1f2256a0..0823733f469f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15723,8 +15723,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
>  		intel_encoders_update_prepare(state);
>  
>  	/* Enable all new slices, we might need */
> -	if (state->modeset)
> -		icl_dbuf_slice_pre_update(state);
> +	icl_dbuf_slice_pre_update(state);
>  
>  	/* Now enable the clocks, plane, pipe, and connectors that we set up. */
>  	dev_priv->display.commit_modeset_enables(state);
> @@ -15780,8 +15779,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
>  	}
>  
>  	/* Disable all slices, we don't need */
> -	if (state->modeset)
> -		icl_dbuf_slice_post_update(state);
> +	icl_dbuf_slice_post_update(state);
>  
>  	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
>  		intel_post_plane_update(state, crtc);

-- 
Jani Nikula, Intel Open Source Graphics Center