diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-07-25 03:50:17 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-07-25 13:47:10 +0200 |
commit | 7dba81f6b7375d01bcdd27fe402481ef14630001 (patch) | |
tree | cac4f32ff2b8ca640527a76405885b00c56d5a3d /source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch | |
parent | 00d6960a08e6f93912de4288aad90310fbf390ee (diff) | |
download | current-7dba81f6b7375d01bcdd27fe402481ef14630001.tar.gz current-7dba81f6b7375d01bcdd27fe402481ef14630001.tar.xz |
Wed Jul 25 03:50:17 UTC 201820180725035017
a/kernel-generic-4.14.57-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.57-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.57-x86_64-1.txz: Upgraded.
a/shadow-4.2.1-x86_64-5.txz: Rebuilt.
adduser: added "input" to additional user groups. Thanks to stormtracknole.
a/sysvinit-scripts-2.1-noarch-14.txz: Rebuilt.
Handle remote (NFS, etc.) mounts with spaces in the name. Thanks to upnort.
d/kernel-headers-4.14.57-x86-1.txz: Upgraded.
d/parallel-20180722-noarch-1.txz: Upgraded.
d/rust-1.27.2-x86_64-1.txz: Upgraded.
d/subversion-1.10.2-x86_64-1.txz: Upgraded.
k/kernel-source-4.14.57-noarch-1.txz: Upgraded.
l/libgphoto2-2.5.19-x86_64-1.txz: Upgraded.
l/libzip-1.5.1-x86_64-4.txz: Rebuilt.
Make sure that the API-CHANGES file is included in the package documentation.
x/xf86-video-r128-6.11.0-x86_64-1.txz: Upgraded.
x/xorg-server-1.20.0-x86_64-3.txz: Rebuilt.
Applied some patches that other distributions have been using for a while:
Fix glamor so that the return value from glamor_fds_from_pixmap matches
what's expected (thanks to Darth Vader for pointing out these patches).
Autobind secondary GPUs to the master as output sink / offload source. This
seems like a beneficial patch until/unless DEs start to handle this.
For nvidia cards, if they are GeForce 8 or newer use the modesetting driver
by default. Seems to be recommmended by upstream where they indicate that
fixes going into nouveau are primarily to target older cards for legacy
support and that the modesetting ddx is preferable for newer ones:
https://bugs.freedesktop.org/show_bug.cgi?id=94844
x/xorg-server-xephyr-1.20.0-x86_64-3.txz: Rebuilt.
x/xorg-server-xnest-1.20.0-x86_64-3.txz: Rebuilt.
x/xorg-server-xvfb-1.20.0-x86_64-3.txz: Rebuilt.
isolinux/initrd.img: Rebuilt.
Use ter-v14v.psf.gz as the consolefont. It supports more character sets, and
the larger font was causing wraparound on UEFI (at least on bare metal here).
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
-rw-r--r-- | source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch b/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch new file mode 100644 index 000000000..ab92d3fca --- /dev/null +++ b/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch @@ -0,0 +1,58 @@ +From patchwork Wed May 23 09:43:33 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [xserver, 2/2] glamor: Propagate glamor_fds_from_pixmap error in + glamor_fd_from_pixmap +From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net> +X-Patchwork-Id: 224910 +Message-Id: <20180523094333.11076-2-michel@daenzer.net> +To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>, + Daniel Stone <daniels@collabora.com> +Cc: xorg-devel@lists.x.org +Date: Wed, 23 May 2018 11:43:33 +0200 + +From: Michel Dänzer <michel.daenzer@amd.com> + +glamor_fds_from_pixmap returns 0 on error, but we were treating that as +success, continuing with uninitialized stride and fd values. + +Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap. + +Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and + BuffersFromPixmap" +Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> +--- + glamor/glamor.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +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 |