diff options
author | Simon Ser <contact@emersion.fr> | 2020-12-22 18:23:28 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-01-10 11:24:35 +0100 |
commit | 91cb0fc4432592a8c0806d3e63dc77ce16c73cb6 (patch) | |
tree | a2261095c9dbcf92a4d50fab32bce55f81325cd6 /backend/drm/renderer.c | |
parent | 5bd86b94f9a6f3b41d1bc4bbf2985632fdd6d0a7 (diff) |
backend/drm: only keep track of local buffer
Stop keeping track of buffers on the parent GPU when multi-GPU is used.
This removes support for export_dmabuf on secondary GPUs, but renderer
v6 will bring this back by managing the swapchains in wlr_output instead
of the backends.
Diffstat (limited to 'backend/drm/renderer.c')
-rw-r--r-- | backend/drm/renderer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 2188ebf8..10280660 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -304,7 +304,6 @@ void drm_fb_clear(struct wlr_drm_fb **fb_ptr) { } gbm_bo_destroy(fb->bo); - wlr_buffer_unlock(fb->local_wlr_buf); wlr_buffer_unlock(fb->wlr_buf); free(fb); @@ -364,18 +363,16 @@ static struct gbm_bo *get_bo_for_dmabuf(struct gbm_device *gbm, } static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm, - struct wlr_buffer *buf, struct wlr_buffer *local_buf, - const struct wlr_drm_format_set *formats) { + struct wlr_buffer *buf, const struct wlr_drm_format_set *formats) { struct wlr_drm_fb *fb = calloc(1, sizeof(*fb)); if (!fb) { return NULL; } fb->wlr_buf = wlr_buffer_lock(buf); - fb->local_wlr_buf = wlr_buffer_lock(local_buf); struct wlr_dmabuf_attributes attribs; - if (!wlr_buffer_get_dmabuf(local_buf, &attribs)) { + if (!wlr_buffer_get_dmabuf(buf, &attribs)) { wlr_log(WLR_ERROR, "Failed to get DMA-BUF from buffer"); goto error_get_dmabuf; } @@ -411,7 +408,6 @@ static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm, error_get_fb_for_bo: gbm_bo_destroy(fb->bo); error_get_dmabuf: - wlr_buffer_unlock(fb->local_wlr_buf); wlr_buffer_unlock(fb->wlr_buf); free(fb); return NULL; @@ -432,7 +428,7 @@ bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm, local_buf = wlr_buffer_lock(buf); } - struct wlr_drm_fb *fb = drm_fb_create(drm, buf, local_buf, formats); + struct wlr_drm_fb *fb = drm_fb_create(drm, local_buf, formats); wlr_buffer_unlock(local_buf); if (!fb) { return false; |