From e77c046cf98f53a9307deeb8940d67938c078986 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 5 Jun 2020 17:38:32 +0200 Subject: backend/drm: fix stack overflow in dealloc_crtc Call drm_crtc_commit directly instead of calling drm_connector_set_mode. This restores the previous behaviour where conn_enable was called [1]. [1]: https://github.com/swaywm/wlroots/blob/0c7c562482575cacaecadcd7913ef25aeb21711f/backend/drm/drm.c#L1093 Closes: https://github.com/swaywm/wlroots/issues/2253 --- backend/drm/drm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'backend/drm') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 822ef0e2..43453072 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1052,7 +1052,12 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) { wlr_log(WLR_DEBUG, "De-allocating CRTC %zu for output '%s'", conn->crtc - drm->crtcs, conn->output.name); - drm_connector_set_mode(conn, NULL); + conn->crtc->pending_modeset = true; + conn->crtc->pending.active = false; + if (!drm_crtc_commit(conn, 0)) { + return; + } + drm_plane_finish_surface(conn->crtc->primary); drm_plane_finish_surface(conn->crtc->cursor); if (conn->crtc->cursor != NULL) { -- cgit v1.2.3