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

backend/drm: add wlr_drm_buf.local_wlr_buf

This commit is contained in:
Simon Ser 2020-12-22 18:08:10 +01:00
parent cd64610c66
commit 5bd86b94f9
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/drm/renderer.c
View File

@ -304,8 +304,8 @@ void drm_fb_clear(struct wlr_drm_fb **fb_ptr) {
} }
gbm_bo_destroy(fb->bo); gbm_bo_destroy(fb->bo);
wlr_buffer_unlock(fb->local_wlr_buf);
wlr_buffer_unlock(fb->wlr_buf); wlr_buffer_unlock(fb->wlr_buf);
wlr_buffer_unlock(fb->mgpu_wlr_buf);
free(fb); free(fb);
*fb_ptr = NULL; *fb_ptr = NULL;
@ -364,7 +364,7 @@ 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, static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm,
struct wlr_buffer *buf, struct wlr_buffer *mgpu_buf, struct wlr_buffer *buf, struct wlr_buffer *local_buf,
const struct wlr_drm_format_set *formats) { const struct wlr_drm_format_set *formats) {
struct wlr_drm_fb *fb = calloc(1, sizeof(*fb)); struct wlr_drm_fb *fb = calloc(1, sizeof(*fb));
if (!fb) { if (!fb) {
@ -372,11 +372,8 @@ static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm,
} }
fb->wlr_buf = wlr_buffer_lock(buf); fb->wlr_buf = wlr_buffer_lock(buf);
if (mgpu_buf) { fb->local_wlr_buf = wlr_buffer_lock(local_buf);
fb->mgpu_wlr_buf = wlr_buffer_lock(mgpu_buf);
}
struct wlr_buffer *local_buf = mgpu_buf ? mgpu_buf : buf;
struct wlr_dmabuf_attributes attribs; struct wlr_dmabuf_attributes attribs;
if (!wlr_buffer_get_dmabuf(local_buf, &attribs)) { if (!wlr_buffer_get_dmabuf(local_buf, &attribs)) {
wlr_log(WLR_ERROR, "Failed to get DMA-BUF from buffer"); wlr_log(WLR_ERROR, "Failed to get DMA-BUF from buffer");
@ -414,7 +411,7 @@ static struct wlr_drm_fb *drm_fb_create(struct wlr_drm_backend *drm,
error_get_fb_for_bo: error_get_fb_for_bo:
gbm_bo_destroy(fb->bo); gbm_bo_destroy(fb->bo);
error_get_dmabuf: error_get_dmabuf:
wlr_buffer_unlock(fb->mgpu_wlr_buf); wlr_buffer_unlock(fb->local_wlr_buf);
wlr_buffer_unlock(fb->wlr_buf); wlr_buffer_unlock(fb->wlr_buf);
free(fb); free(fb);
return NULL; return NULL;
@ -423,18 +420,20 @@ error_get_dmabuf:
bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm, bool drm_fb_import(struct wlr_drm_fb **fb_ptr, struct wlr_drm_backend *drm,
struct wlr_buffer *buf, struct wlr_drm_surface *mgpu, struct wlr_buffer *buf, struct wlr_drm_surface *mgpu,
const struct wlr_drm_format_set *formats) { const struct wlr_drm_format_set *formats) {
struct wlr_buffer *mgpu_buf = NULL; struct wlr_buffer *local_buf;
if (drm->parent && mgpu) { if (drm->parent && mgpu) {
// Perform a copy across GPUs // Perform a copy across GPUs
mgpu_buf = drm_surface_blit(mgpu, buf); local_buf = drm_surface_blit(mgpu, buf);
if (!mgpu_buf) { if (!local_buf) {
wlr_log(WLR_ERROR, "Failed to blit buffer across GPUs"); wlr_log(WLR_ERROR, "Failed to blit buffer across GPUs");
return false; return false;
} }
} else {
local_buf = wlr_buffer_lock(buf);
} }
struct wlr_drm_fb *fb = drm_fb_create(drm, buf, mgpu_buf, formats); struct wlr_drm_fb *fb = drm_fb_create(drm, buf, local_buf, formats);
wlr_buffer_unlock(mgpu_buf); wlr_buffer_unlock(local_buf);
if (!fb) { if (!fb) {
return false; return false;
} }

5
include/backend/drm/renderer.h
View File

@ -30,10 +30,9 @@ struct wlr_drm_surface {
}; };
struct wlr_drm_fb { struct wlr_drm_fb {
struct wlr_buffer *wlr_buf; struct wlr_buffer *wlr_buf; // original buffer
struct wlr_buffer *mgpu_wlr_buf;
struct wlr_buffer *local_wlr_buf; // GPU-local buffer
struct gbm_bo *bo; struct gbm_bo *bo;
uint32_t id; uint32_t id;
}; };