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

backend/drm: track gbm_bo during direct scan-out 

We need to destroy the gbm_bo we imported and drmModeRmFb.

Closes: https://github.com/swaywm/sway/issues/4662
This commit is contained in:
Simon Ser 2019-10-22 19:29:18 +02:00 committed by Scott Anderson
parent 61a6f2b928
commit fd25e2ca11
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/drm/drm.c
View File

@ -382,6 +382,11 @@ static bool drm_connector_commit(struct wlr_output *output) {
return false; return false;
} }
if (conn->pending_bo != NULL) {
gbm_bo_destroy(conn->pending_bo);
}
conn->pending_bo = bo;
fb_id = get_fb_for_bo(bo, gbm_bo_get_format(bo), drm->addfb2_modifiers); fb_id = get_fb_for_bo(bo, gbm_bo_get_format(bo), drm->addfb2_modifiers);
if (fb_id == 0) { if (fb_id == 0) {
wlr_log(WLR_ERROR, "get_fb_for_bo failed"); wlr_log(WLR_ERROR, "get_fb_for_bo failed");
@ -1404,6 +1409,12 @@ static void page_flip_handler(int fd, unsigned seq,
conn->current_buffer = conn->pending_buffer; conn->current_buffer = conn->pending_buffer;
conn->pending_buffer = NULL; conn->pending_buffer = NULL;
if (conn->current_bo != NULL) {
gbm_bo_destroy(conn->current_bo);
}
conn->current_bo = conn->pending_bo;
conn->pending_bo = NULL;
uint32_t present_flags = WLR_OUTPUT_PRESENT_VSYNC | uint32_t present_flags = WLR_OUTPUT_PRESENT_VSYNC |
WLR_OUTPUT_PRESENT_HW_CLOCK | WLR_OUTPUT_PRESENT_HW_COMPLETION; WLR_OUTPUT_PRESENT_HW_CLOCK | WLR_OUTPUT_PRESENT_HW_COMPLETION;
if (conn->current_buffer != NULL) { if (conn->current_buffer != NULL) {

2
include/backend/drm/drm.h
View File

@ -131,8 +131,10 @@ struct wlr_drm_connector {
struct wlr_dmabuf_attributes pending_dmabuf; struct wlr_dmabuf_attributes pending_dmabuf;
// Buffer submitted to the kernel but not yet displayed // Buffer submitted to the kernel but not yet displayed
struct wlr_buffer *pending_buffer; struct wlr_buffer *pending_buffer;
struct gbm_bo *pending_bo;
// Buffer currently being displayed // Buffer currently being displayed
struct wlr_buffer *current_buffer; struct wlr_buffer *current_buffer;
struct gbm_bo *current_bo;
}; };
struct wlr_drm_backend *get_drm_backend_from_backend( struct wlr_drm_backend *get_drm_backend_from_backend(