Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix output manager segfault #4673

Merged
merged 2 commits into from
Oct 27, 2019

Conversation

emersion
Copy link
Member

See individual commit messages.

Closes: swaywm/wlroots#1867

apply_output_config would call output_enable and always return true,
even if the output couldn't be enabled.
Calling wlr_output_manager_v1_set_configuration with an enabled output
and a NULL mode is incorrect if the output doesn't support modes.

When DPMS'ing an output, wlr_output_enable(output, false) is called.
This de-allocates the CRTC and sets wlr_output.current_mode to NULL.

Because we mark DPMS'ed outputs as enabled, we also need to provide a
correct output mode. Add a field to sway_output to hold the current
mode.

Closes: swaywm/wlroots#1867
emersion added a commit to emersion/wlroots that referenced this pull request Oct 26, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
ddevault pushed a commit to swaywm/wlroots that referenced this pull request Oct 27, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
@ddevault
Copy link
Contributor

Thanks!

@ddevault ddevault merged commit ec14a00 into swaywm:master Oct 27, 2019
aiqs4 pushed a commit to aiqs4/wlroots that referenced this pull request Dec 19, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
aiqs4 pushed a commit to aiqs4/wlroots that referenced this pull request Dec 19, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
aiqs4 pushed a commit to aiqs4/wlroots that referenced this pull request Dec 19, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
aiqs4 pushed a commit to aiqs4/wlroots that referenced this pull request Dec 19, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
aiqs4 pushed a commit to aiqs4/wlroots that referenced this pull request Dec 19, 2019
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
filips pushed a commit to filips/wlroots that referenced this pull request Mar 15, 2020
Makes it easier to figure out when the compositor submits an invalid
output state.

References: swaywm/sway#4673
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Assertion failed in wlr-output-management with swayidle and kanshi
2 participants