From b213d2b81fbb2f0b8c805694e6d9d4f244458e4b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 5 Jul 2021 10:57:33 +0200 Subject: [PATCH] Revert "backend/drm: populate cursor plane's current_fb" This reverts commit 6c3d080e25e56404228ad7704eed43e40fa0c623. Populating wlr_drm_plane.current_fb messes up the buffer's locking. The previous buffer is released while it's still being displayed on-screen. (cherry picked from commit 5f26360bd89b3e4818474142332744268fec45d4) --- backend/drm/drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index c1f07167..0b557454 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -933,7 +933,7 @@ static bool drm_connector_set_cursor(struct wlr_output *output, local_buf = wlr_buffer_lock(buffer); } - bool ok = drm_fb_import(&plane->current_fb, drm, local_buf, + bool ok = drm_fb_import(&plane->pending_fb, drm, local_buf, &plane->formats); wlr_buffer_unlock(local_buf); if (!ok) {