aboutsummaryrefslogtreecommitdiff
path: root/backend/drm
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-12-15 12:16:26 +0100
committerSimon Ser <contact@emersion.fr>2020-12-17 20:38:02 +0100
commit60001a75a276f931b02d78a95cedfd0098b88617 (patch)
tree95992c5057fa0bfef04e0dbcfabb388559d5b02f /backend/drm
parentbdf26f87d548c75f5ef90f21645d2370a6ee34f6 (diff)
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
Diffstat (limited to 'backend/drm')
-rw-r--r--backend/drm/drm.c13
1 files changed, 0 insertions, 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;
}