From 92eedb84c153474024878a9780c83967f5bc63e6 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 1 Feb 2023 12:31:04 +0100 Subject: [PATCH] output: don't attach buffer on first commit if disabled In output_ensure_buffer() we create a swapchain and attach an empty buffer to the output if necessary. We do that during the first commit. This is fine when the first commit enables the output, however this breaks when the first commit disables the output. A commit which disables an output and has a buffer attached is invalid (see output_basic_test()), and makes the DRM backend crash: 00:00:00.780 [wlr] [backend/drm/drm.c:622] connector eDP-1: Turning off ../subprojects/wlroots/backend/drm/drm.c:652:44: runtime error: member access within null pointer of type 'struct wlr_drm_crtc' AddressSanitizer:DEADLYSIGNAL ================================================================= ==2524==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7f22e894afc1 bp 0x7ffe1d57c550 sp 0x7ffe1d57c420 T0) ==2524==The signal is caused by a READ memory access. ==2524==Hint: address points to the zero page. #0 0x7f22e894afc1 in drm_connector_commit_state ../subprojects/wlroots/backend/drm/drm.c:652 #1 0x7f22e894b1f5 in drm_connector_commit ../subprojects/wlroots/backend/drm/drm.c:674 #2 0x7f22e89e8da9 in wlr_output_commit_state ../subprojects/wlroots/types/output/output.c:756 #3 0x555ab325624d in apply_output_config ../sway/config/output.c:517 #4 0x555ab31a1aa1 in handle_new_output ../sway/desktop/output.c:974 #5 0x7f22e9272f6d in wl_signal_emit_mutable (/usr/lib/libwayland-server.so.0+0x9f6d) #6 0x7f22e899b012 in new_output_reemit ../subprojects/wlroots/backend/multi/backend.c:161 #7 0x7f22e9272f6d in wl_signal_emit_mutable (/usr/lib/libwayland-server.so.0+0x9f6d) #8 0x7f22e895a153 in scan_drm_connectors ../subprojects/wlroots/backend/drm/drm.c:1488 #9 0x7f22e893c2e4 in backend_start ../subprojects/wlroots/backend/drm/backend.c:24 #10 0x7f22e892ed00 in wlr_backend_start ../subprojects/wlroots/backend/backend.c:56 #11 0x7f22e8999b83 in multi_backend_start ../subprojects/wlroots/backend/multi/backend.c:31 #12 0x7f22e892ed00 in wlr_backend_start ../subprojects/wlroots/backend/backend.c:56 #13 0x555ab317d5cc in server_start ../sway/server.c:316 #14 0x555ab317748d in main ../sway/main.c:400 #15 0x7f22e783c28f (/usr/lib/libc.so.6+0x2328f) #16 0x7f22e783c349 in __libc_start_main (/usr/lib/libc.so.6+0x23349) #17 0x555ab3134c84 in _start (/home/simon/src/sway/build/sway/sway+0x377c84) Fixes: 3be6658ee7b6 ("output: allocate swapchain on first commit") Closes: https://github.com/swaywm/sway/issues/7373 --- types/output/render.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/types/output/render.c b/types/output/render.c index 25468c13..8e0895a6 100644 --- a/types/output/render.c +++ b/types/output/render.c @@ -207,6 +207,11 @@ bool output_ensure_buffer(struct wlr_output *output, return true; } + bool enabled = output->enabled; + if (state->committed & WLR_OUTPUT_STATE_ENABLED) { + enabled = state->enabled; + } + // If we're lighting up an output or changing its mode, make sure to // provide a new buffer bool needs_new_buffer = false; @@ -219,7 +224,7 @@ bool output_ensure_buffer(struct wlr_output *output, if (state->committed & WLR_OUTPUT_STATE_RENDER_FORMAT) { needs_new_buffer = true; } - if (state->allow_artifacts && output->commit_seq == 0) { + if (state->allow_artifacts && output->commit_seq == 0 && enabled) { // On first commit, require a new buffer if the compositor called a // mode-setting function, even if the mode won't change. This makes it // so the swapchain is created now.