Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
Commits:
-
2b925c8a
by Mike Hommey at 2018-06-21T07:03:26+09:00
3 changed files:
Changes:
| 1 | 1 |
xorg-server (2:1.20.0-3) UNRELEASED; urgency=medium
|
| 2 | 2 |
|
| 3 |
+ [ Timo Aaltonen ]
|
|
| 3 | 4 |
* control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
|
| 4 | 5 |
|
| 6 |
+ [ Mike Hommey ]
|
|
| 7 |
+ * 07_fix_glamor_fds_from_pixmap.diff: Apply 3da999a and 4d5950c from
|
|
| 8 |
+ upstream to fix an infinite loop in XWayland. Closes: #901883.
|
|
| 9 |
+ |
|
| 5 | 10 |
-- Timo Aaltonen <tjaalton@debian.org> Wed, 13 Jun 2018 11:07:10 +0300
|
| 6 | 11 |
|
| 7 | 12 |
xorg-server (2:1.20.0-2) unstable; urgency=medium
|
| 1 |
+Description: Apply 3da999a and 4d5950c from upstream
|
|
| 2 |
+Author: Michel Dänzer <michel.daenzer@amd.com>
|
|
| 3 |
+ |
|
| 4 |
+Index: xorg-server/glamor/glamor.c
|
|
| 5 |
+===================================================================
|
|
| 6 |
+--- xorg-server.orig/glamor/glamor.c
|
|
| 7 |
++++ xorg-server/glamor/glamor.c
|
|
| 8 |
+@@ -828,20 +828,20 @@ glamor_fds_from_pixmap(ScreenPtr screen,
|
|
| 9 |
+ glamor_get_screen_private(pixmap->drawable.pScreen);
|
|
| 10 |
+
|
|
| 11 |
+ if (!glamor_priv->dri3_enabled)
|
|
| 12 |
+- return -1;
|
|
| 13 |
++ return 0;
|
|
| 14 |
+ switch (pixmap_priv->type) {
|
|
| 15 |
+ case GLAMOR_TEXTURE_DRM:
|
|
| 16 |
+ case GLAMOR_TEXTURE_ONLY:
|
|
| 17 |
+ if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
|
|
| 18 |
+ GL_RGB10_A2 : GL_RGBA, 0))
|
|
| 19 |
+- return -1;
|
|
| 20 |
++ return 0;
|
|
| 21 |
+ return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
|
|
| 22 |
+ strides, offsets,
|
|
| 23 |
+ modifier);
|
|
| 24 |
+ default:
|
|
| 25 |
+ break;
|
|
| 26 |
+ }
|
|
| 27 |
+- return -1;
|
|
| 28 |
++ return 0;
|
|
| 29 |
+ }
|
|
| 30 |
+
|
|
| 31 |
+ _X_EXPORT int
|
|
| 32 |
+@@ -857,7 +857,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
|
|
| 33 |
+ &modifier);
|
|
| 34 |
+
|
|
| 35 |
+ /* Pixmaps with multi-planes/modifier are not supported in this interface */
|
|
| 36 |
+- if (ret > 1) {
|
|
| 37 |
++ if (ret != 1 || offsets[0] != 0) {
|
|
| 38 |
+ while (ret > 0)
|
|
| 39 |
+ close(fds[--ret]);
|
|
| 40 |
+ return -1;
|
| ... | ... | @@ -5,3 +5,4 @@ |
| 5 | 5 |
03_static-nettle.diff
|
| 6 | 6 |
05_Revert-Unload-submodules.diff
|
| 7 | 7 |
06_use-intel-only-on-pre-gen4.diff
|
| 8 |
+07_fix_glamor_fds_from_pixmap.diff
|