modesetting: Don't recursively force present to unflip#2123
Merged
metux merged 1 commit intoX11Libre:masterfrom Mar 19, 2026
Merged
modesetting: Don't recursively force present to unflip#2123metux merged 1 commit intoX11Libre:masterfrom
metux merged 1 commit intoX11Libre:masterfrom
Conversation
Present calls drmmode_set_mode_major() as part of ms_present_unflip(), which leads to a crash due to the recursive attempt to force present to unflip when it already is. Fix it by simply skipping the forced present unflip when present itself is unflipping. This also speeds up drmmmode_prepare_modeset() when present isn't even flipping to begin with. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1791 Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/commit/899c87af1fc26fd8b8dbc539ec7b93066df2ad37 ("modesetting: unflip before any setcrtc() calls") Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1793>
stefan11111
requested review from
a team,
algrid,
b-aaz,
callmetango,
cepelinas9000 and
metux
cepelinas9000
approved these changes
Mar 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Present calls drmmode_set_mode_major() as part of ms_present_unflip(), which leads to a crash due to the recursive attempt to force present to unflip when it already is.
Fix it by simply skipping the forced present unflip when present itself is unflipping. This also speeds up drmmmode_prepare_modeset() when present isn't even flipping to begin with.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1791
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/commit/899c87af1fc26fd8b8dbc539ec7b93066df2ad37 ("modesetting: unflip before any setcrtc() calls")
Part-of: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1793