Re: Patch "drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled" has been added to the 6.1-stable tree

[Jani Nikula <jani.nikula@linux.intel.com>]

On Mon, 04 Dec 2023, Sasha Levin <sashal@kernel.org> wrote:
> This is a note to let you know that I've just added the patch titled
>
>     drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled
>
> to the 6.1-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
>      drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch
> and it can be found in the queue-6.1 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.

Turns out this one requires another commit to go with it, both for
v6.7-rc* and stable backports. I was just a bit too late with it for
v6.7-rc4 [1].

Please hold off with all stable backports of this until you can backport

96d7e7940136 ("drm/i915: Check pipe active state in {planes,vrr}_{enabling,disabling}()")

from drm-intel-fixes with it. It should find its way to v6.7-rc5.

Thanks, and sorry for the mess. :(


BR,
Jani.


[1] https://lore.kernel.org/all/87fs0m48ol.fsf@intel.com/


>
>
>
> commit ad928967f1fc1951f16e2190472fb5c50401be74
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date:   Tue Nov 21 07:43:15 2023 +0200
>
>     drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled
>     
>     [ Upstream commit d21a3962d3042e6f56ad324cf18bdd64a1e6ecfa ]
>     
>     We used to call intel_pre_plane_updates() for any pipe going through
>     a modeset whether the pipe was previously enabled or not. This in
>     fact needed to apply all the necessary clock gating workarounds/etc.
>     Restore the correct behaviour.
>     
>     Fixes: 39919997322f ("drm/i915: Disable all planes before modesetting any pipes")
>     Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>     Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>     Link: https://patchwork.freedesktop.org/patch/msgid/20231121054324.9988-3-ville.syrjala@linux.intel.com
>     (cherry picked from commit e0d5ce11ed0a21bb2bf328ad82fd261783c7ad88)
>     Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>     Signed-off-by: Sasha Levin <sashal@kernel.org>
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 96e679a176e94..1977f4c6fd889 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7188,10 +7188,11 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
>  		if (!intel_crtc_needs_modeset(new_crtc_state))
>  			continue;
>  
> +		intel_pre_plane_update(state, crtc);
> +
>  		if (!old_crtc_state->hw.active)
>  			continue;
>  
> -		intel_pre_plane_update(state, crtc);
>  		intel_crtc_disable_planes(state, crtc);
>  	}
>  

-- 
Jani Nikula, Intel