Commit 2b925c8a authored by Mike Hommey's avatar Mike Hommey Committed by Mike Hommey

Apply 3da999a and 4d5950c from upstream to fix an infinite loop in XWayland

parent d1cce6cb
xorg-server (2:1.20.0-3) UNRELEASED; 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.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 13 Jun 2018 11:07:10 +0300
xorg-server (2:1.20.0-2) unstable; urgency=medium
......
Description: Apply 3da999a and 4d5950c from upstream
Author: Michel Dänzer <michel.daenzer@amd.com>
Index: xorg-server/glamor/glamor.c
===================================================================
--- xorg-server.orig/glamor/glamor.c
+++ xorg-server/glamor/glamor.c
@@ -828,20 +828,20 @@ glamor_fds_from_pixmap(ScreenPtr screen,
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
@@ -857,7 +857,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
&modifier);
/* Pixmaps with multi-planes/modifier are not supported in this interface */
- if (ret > 1) {
+ if (ret != 1 || offsets[0] != 0) {
while (ret > 0)
close(fds[--ret]);
return -1;
......@@ -5,3 +5,4 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
06_use-intel-only-on-pre-gen4.diff
07_fix_glamor_fds_from_pixmap.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment