From 60001a75a276f931b02d78a95cedfd0098b88617 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 15 Dec 2020 12:16:26 +0100 Subject: [PATCH] backend/drm: remove nouveau workaround The workaround is broken because drm_fb_acquire doesn't leave the EGL context current anymore. We'll need to re-introduce it. References: https://github.com/swaywm/wlroots/issues/2525 --- backend/drm/drm.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 7dedddc7..0fb7dfc4 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -959,19 +959,6 @@ static bool drm_connector_set_cursor(struct wlr_output *output, plane->cursor_enabled = true; } - if (plane->cursor_enabled) { - drm_fb_acquire(&plane->pending_fb, drm, &plane->mgpu_surf); - /* Workaround for nouveau buffers created with GBM_BO_USER_LINEAR are - * placed in NOUVEAU_GEM_DOMAIN_GART. When the bo is attached to the - * cursor plane it is moved to NOUVEAU_GEM_DOMAIN_VRAM. However, this - * does not wait for the render operations to complete, leaving an - * empty surface. See - * https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/issues/480 - * The render operations can be waited for using: - */ - glFinish(); - } - wlr_output_update_needs_frame(output); return true; }