--- Begin Message ---
Package: xwayland
Version: 2:1.20.0-2
Severity: normal
Tags: patch
Dear Maintainer,
while trying to watch the German TV show "Die Sendung mit der Maus" from
https://www.wdrmaus.de/aktuelle-sendung/, my Gnome desktop freezes. I can
SSH into the machine and see that Xwayland eats 100% CPU. The freeze can be
reproduced, it happened every time I accessed the above URL in Firefox 60.
I found a similar issue in the Red Hat bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1579067
The issue mentions patches in
https://patchwork.freedesktop.org/series/43618/. I applied them to the
xorg-server source, built and installed the package and the freeze does not
happen anymore.
The patches are also attached to this bugreport.
Regards,
Tino
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.17.2 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages xwayland depends on:
ii libaudit1 1:2.8.3-1
ii libbsd0 0.9.1-1
ii libc6 2.27-3
ii libdrm2 2.4.92-1
ii libegl1 1.0.0+git20180308-3
ii libepoxy0 1.4.3-1
ii libgbm1 18.1.1-1
ii libgcrypt20 1.8.3-1
ii libgl1 1.0.0+git20180308-3
ii libpixman-1-0 0.34.0-2
ii libselinux1 2.8-1
ii libsystemd0 238-5
ii libwayland-client0 1.15.0-2
ii libxau6 1:1.0.8-1+b2
ii libxdmcp6 1:1.1.2-3
ii libxfont2 1:2.0.3-1
ii libxshmfence1 1.3-1
ii xserver-common 2:1.20.0-2
xwayland recommends no packages.
xwayland suggests no packages.
-- debconf-show failed
diff --git a/glamor/glamor.c b/glamor/glamor.c
index d984d20f3..e2c74d17a 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
glamor_get_screen_private(pixmap->drawable.pScreen);
if (!glamor_priv->dri3_enabled)
- return -1;
+ return 0;
switch (pixmap_priv->type) {
case GLAMOR_TEXTURE_DRM:
case GLAMOR_TEXTURE_ONLY:
if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
GL_RGB10_A2 : GL_RGBA, 0))
- return -1;
+ return 0;
return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
strides, offsets,
modifier);
default:
break;
}
- return -1;
+ return 0;
}
_X_EXPORT int
diff --git a/glamor/glamor.c b/glamor/glamor.c
index e2c74d17a..63f0947fa 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen,
&modifier);
/* Pixmaps with multi-planes/modifier are not supported in this interface */
- if (ret > 1) {
- while (ret > 0)
- close(fds[--ret]);
- return -1;
+ if (ret == 1 && offsets[0] == 0) {
+ *stride = strides[0];
+ *size = pixmap->drawable.height * *stride;
+ return fds[0];
}
- ret = fds[0];
- *stride = strides[0];
- *size = pixmap->drawable.height * *stride;
-
- return ret;
+ while (ret > 0)
+ close(fds[--ret]);
+ return -1;
}
_X_EXPORT int
--- End Message ---
--- Begin Message ---
Source: xorg-server
Source-Version: 2:1.20.0-3
We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 901883@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Timo Aaltonen <tjaalton@debian.org> (supplier of updated xorg-server package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 01 Jul 2018 20:07:24 +0300
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-common xorg-server-source xwayland xserver-xorg-legacy
Architecture: source
Version: 2:1.20.0-3
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Timo Aaltonen <tjaalton@debian.org>
Description:
xdmx - distributed multihead X server
xdmx-tools - Distributed Multihead X tools
xnest - Nested X server
xorg-server-source - Xorg X server - source files
xserver-common - common files used by various X servers
xserver-xephyr - nested X server
xserver-xorg-core - Xorg X server - core server
xserver-xorg-core-udeb - Xorg X server - core server (udeb)
xserver-xorg-dev - Xorg X server - development files
xserver-xorg-legacy - setuid root Xorg server wrapper
xvfb - Virtual Framebuffer 'fake' X server
xwayland - Xwayland X server
Closes: 901883
Changes:
xorg-server (2:1.20.0-3) unstable; urgency=medium
.
[ Timo Aaltonen ]
* control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
.
[ Mike Hommey ]
* 07_fix_glamor_fds_from_pixmap.diff: Apply 3da999a and 4d5950c from
upstream to fix an infinite loop in XWayland. Closes: #901883.
Checksums-Sha1:
f6466ceae5ef06f9926ff3f818336ed26de321ba 4446 xorg-server_1.20.0-3.dsc
11d4b75fec12a6efbc6a5fac880bd19fd4bdcd1a 8495473 xorg-server_1.20.0.orig.tar.gz
21f17c523d0cfe08e5954a590be2a7bdbc5ec8f4 705 xorg-server_1.20.0.orig.tar.gz.asc
989aac63e17298934cf381998eb58c6507aae00b 148147 xorg-server_1.20.0-3.diff.gz
8c10bcf93032627c5055ec8be4732eadc87314b1 9027 xorg-server_1.20.0-3_source.buildinfo
Checksums-Sha256:
30f0484a7b39ab742dac48301f746fe9c890cf8e44c62d9627273b1df6ac07f2 4446 xorg-server_1.20.0-3.dsc
6f55004082f9b9c3304037ae78bc5969889d066cf06c0f3130393fef79942ed1 8495473 xorg-server_1.20.0.orig.tar.gz
fdaeea76ac388463e51b680675feb7e4492ee881d03db833216b628f1cc2d637 705 xorg-server_1.20.0.orig.tar.gz.asc
60867543bd1fde5d46e204bfd879bff53db8eba7b2355546520200710fa31004 148147 xorg-server_1.20.0-3.diff.gz
d5dbe5afaef3ec5c9ea7bd717fc5c254a6f18b84bf942ddb9b339d1a9ddb3da3 9027 xorg-server_1.20.0-3_source.buildinfo
Files:
25ebd915782d2cba7030999cc7a2a303 4446 x11 optional xorg-server_1.20.0-3.dsc
b6acadf57ed44c9cb51f08d9a7ac27c9 8495473 x11 optional xorg-server_1.20.0.orig.tar.gz
c5589707cbc255a2f2ceb745a6085a35 705 x11 optional xorg-server_1.20.0.orig.tar.gz.asc
3f6274297b913e14b9953d0d260696de 148147 x11 optional xorg-server_1.20.0-3.diff.gz
f5c9d1280112184a56c20cec2861b775 9027 x11 optional xorg-server_1.20.0-3_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEdS3ifE3rFwGbS2Yjy3AxZaiJhNwFAls5F+QACgkQy3AxZaiJ
hNyc2BAArk2aJE3WkDfLuKOWtDo+lqOIRtOseQ1aWP6L/5QfxEcZCbmsC9GWTnv1
+HqV4UidSJfp1iGmZHw3xY7g/SG/fsv4JOXXRPryR7BbNco5XQQ7uOWCmlTfwGAa
DADWipZFsz+H8n+cRnwLpNX2IsJr41QG4cp5vNN78+YSFiOZ8DvsJXSu/HkXwQg5
a91hFbhSU4+8dPdzwKoAHFEvorRKnkokl6/agU5Q3OYMLNkHlmdKxrCYYL3h6nBl
EVPdJzFkNU24bGXSSJI/Omffc8HoGq3wDVLAvoc9pHNky5pUI7/S+Re1kB0N17EI
YSwgBjwe+abqBmAw/g63O8vh1lofuL/HO6YHeb/NEidaDS3qoJDT7JBNOdkrUgks
IuX3Jki3AtC+egjlO5uj9m2B7JsUd4LIeGZAjMSp6HsF+1wtyo4scHUSozcvyyRw
JLWDNsbigT2X4q9g2epriSssxISDZJUTOzTgkuCQJBrROGkc3oK/oLegD3tA8Xl8
C63JLuF1ueUXwdkqwKHSMySZ+VLdclOE7l8Outrgd6ZORATMRoFMlavQW2u7+U7x
YURTdNqhKrDDKUaEqbfn3iSxDK/EpOfJwBwff02k6I1lUyG6NnDZ7nFAf5xe9h0Y
ORS8hE50C2BwBo2q40WEpPn6NOjgoHL9LfqABGzeq3qfKlhvWJA=
=WneY
-----END PGP SIGNATURE-----
--- End Message ---