Skip to contentSkip to conversation

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

DISCUSSION Jani Nikula 2 participants 3 messages Dec 4, 2023 – Dec 11, 2023 1 message not in the archive Stable branch

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 7 lines · Sasha Levin

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

Quoted 6 lines

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 <[email protected]> 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/[email protected]/

Quoted 41 lines

commit ad928967f1fc1951f16e2190472fb5c50401be74

Author: Ville Syrjälä <[email protected]>
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")
(cherry picked from commit e0d5ce11ed0a21bb2bf328ad82fd261783c7ad88)
drivers/gpu/drm/i915/display/intel_display.c +2 -1
index 96e679a176e94..1977f4c6fd889 100644
@@ -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);
 	}
 
Signature · 1 line
Jani Nikula, Intel
maintainer
#2 lore raw
Quoted 19 lines · Jani Nikula
Quoted 7 lines · Sasha Levin

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

Quoted 6 lines

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 <[email protected]> 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].

Quoted 7 lines

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. :(

No worries, and thanks for letting us know. I'll drop this patch from all trees.

Signature · 2 lines
Thanks,
Sasha
#3 lore raw
Quoted 22 lines · Sasha Levin
Quoted 21 lines · Jani Nikula
Quoted 7 lines · Sasha Levin

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

Quoted 6 lines

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 <[email protected]> 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

Quoted 8 lines
Quoted 5 lines

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. :(

No worries, and thanks for letting us know. I'll drop this patch from all trees.

It should be fine to backport

d21a3962d304 ("drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled")

to stable kernels as long as it's accompanied by

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

which is now in v6.7-rc5.

Thanks,
Jani.

Signature · 1 line
Jani Nikula, Intel