rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add the patch, sigh

Browse Source
This commit is contained in:
Adam Williamson 2014-02-17 22:18:14 -08:00
parent e366185124
commit 95c7b7f704
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
xwayland_destroy_wl_buffers.patch Normal file
View File

@ -0,0 +1,62 @@
From abdbfba12e439d6c27156b1f4a773d68337e30c0 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 11 Feb 2014 16:34:13 +0200
Subject: [PATCH] xwayland: Destroy wl_buffers only after they are released
Destroying a wl_buffer that is still attached to a wl_surface is
undefined behavior according to the wayland protocol. We should delay
the destruction until we get the release event.
---
So, I'm not sure why there was this comment saying that it was safe to
do this, perhaps it was in an old protocol version?
In any case, this has been making xwayland crash under mutter ever
since this mutter commit
https://git.gnome.org/browse/mutter/commit/?h=wayland&id=3e98ffaf9958366b584b360ac12bbc03cd070c07 .
hw/xfree86/xwayland/xwayland-window.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index a2a8206..a005cc6 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -43,6 +43,16 @@
static DevPrivateKeyRec xwl_window_private_key;
static void
+free_buffer(void *data, struct wl_buffer *buffer)
+{
+ wl_buffer_destroy(buffer);
+}
+
+static const struct wl_buffer_listener buffer_listener = {
+ free_buffer,
+};
+
+static void
free_pixmap(void *data, struct wl_callback *callback, uint32_t time)
{
PixmapPtr pixmap = data;
@@ -62,10 +72,8 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)
struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
struct wl_callback *callback;
- /* We can safely destroy the buffer because we only use one buffer
- * per surface in xwayland model */
if (xwl_window->buffer)
- wl_buffer_destroy(xwl_window->buffer);
+ wl_buffer_add_listener(xwl_window->buffer, &buffer_listener, NULL);
xwl_screen->driver->create_window_buffer(xwl_window, pixmap);
@@ -185,7 +193,7 @@ xwl_unrealize_window(WindowPtr window)
return ret;
if (xwl_window->buffer)
- wl_buffer_destroy(xwl_window->buffer);
+ wl_buffer_add_listener(xwl_window->buffer, &buffer_listener, NULL);
wl_surface_destroy(xwl_window->surface);
xorg_list_del(&xwl_window->link);
if (RegionNotEmpty(DamageRegion(xwl_window->damage)))