blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Simon Ser 2020-12-15 12:16:26 +01:00
parent bdf26f87d5
commit 60001a75a2
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/drm/drm.c
View File

@ -959,19 +959,6 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
plane->cursor_enabled = true; 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); wlr_output_update_needs_frame(output);
return true; return true;
} }