mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Remove destroy listeners when disabling planes

Browse Source 
When an unused plane is disabled, the destroy listener for a previously
used buffer needs to be removed. This fixes a crash when an overlay
would be reenabled using the same buffer as before, causing the destroy
listener to be inserted twice.
This commit is contained in:
Ander Conselvan de Oliveira
2012-06-26 17:09:14 +03:00
committed by Kristian Høgsberg
parent a73269637f
commit fd1f4c650f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+8 -2
View File
@@ -29,6 +29,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <linux/input.h> #include <linux/input.h>
#include <assert.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
@@ -520,8 +521,13 @@ drm_disable_unused_sprites(struct weston_output *output_base)
weston_log("failed to disable plane: %d: %s\n", weston_log("failed to disable plane: %d: %s\n",
ret, strerror(errno)); ret, strerror(errno));
drmModeRmFB(c->drm.fd, s->fb_id); drmModeRmFB(c->drm.fd, s->fb_id);
s->surface = NULL;
s->pending_surface = NULL; if (s->surface) {
s->surface = NULL;
wl_list_remove(&s->destroy_listener.link);
}
assert(!s->pending_surface);
s->fb_id = 0; s->fb_id = 0;
s->pending_fb_id = 0; s->pending_fb_id = 0;
} }