Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
Commits: ad7364d8 by Kenneth Graunke at 2020-01-14T15:30:57-08:00 configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available Commit 195c2ef8f9f07b9bdabc0f554a9033b7857b99c7 added this to the Meson build but neglected to add it to autotools. v2: Also update dix-config.h.in Fixes: 195c2ef8f ("glamor: Add a function to get the driver name via EGL_MESA_query_driver") Reviewed-by: Michel Dänzer <mdaen...@redhat.com> [v1] Reviewed-by: Eric Engestrom <e...@engestrom.ch> [v1] Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit 25ca99df38a2c28c25ab20a917e68442285f2353) - - - - - c2ef88c4 by Michel Dänzer at 2020-01-14T15:31:01-08:00 modesetting: Explicitly #include "mi.h" For the miClearDrawable prototype. Apparently it doesn't get pulled in for some build configurations, breaking the build. Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit a24a786fc8490fda08b15c3dab6fa6750f008ecb) - - - - - d845ceae by George Matsumura at 2020-02-06T17:54:36+01:00 Restrict 1x1 pixmap filling optimization to GXcopy This restricts an optimization whereby the filling of 1x1 pixmaps went around the driver-provided function to cases where the source color is meant to be directly copied to the destination, as opposed to other operations which should produce different destination values than just the foreground color. Signed-off-by: George Matsumura <gmmatsumur...@bvsd.org> Reviewed-by: Michel Dänzer <mdaen...@redhat.com> (cherry picked from commit 83826075e59c0393c16d2a2482dc5c9f2fdf4564) - - - - - e5293f1c by Adam Jackson at 2020-02-06T18:01:55+01:00 Revert "dri2: Don't make reference to noClientException" It's true that the value would always be -1, if it's not zero, but it's usually zero is the problem. As a result we return failure from otherwise successful indirect GLX paths, which isn't very nice of us. This reverts commit 7d33ab0f8c7958b205076f71e4b47c24aace77fd. Fixes: https://gitlab.freedesktop.org/xorg/xserver/issues/211 (cherry picked from commit e1fa3beb2fe2519e69f859f0acdc68e5a770de27) - - - - - af2fd88b by Daniel Llewellyn at 2020-02-06T18:02:01+01:00 os: Ignore dying client in ResetCurrentRequest You might as well, it's harmless. Better, some cleanup code (like DRI2 swap wait) needs to run both normally and at client exit, so it simplifies the callers to not need to check first. See 4308f5d3 for a similar example. Props: @ajax (Adam Jackson) Fixes: xorg/xserver#211 Signed-off-by: Daniel Llewellyn <diddle...@ubuntu.com> (cherry picked from commit 578371616e09364318c9fb2371a693d438b31b29) - - - - - 1c3e51da by Michel Dänzer at 2020-02-06T18:02:06+01:00 xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL Avoids a crash in xf86RotatePrepare -> DamageRegister during CreateScreenResources if rotation or another transform is configured for any connected RandR output in xorg.conf. The generic rotation/transform code generally can't work without the root window currently. Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/969 Fixes: 094f42cdfe5d "xfree86/modes: Call xf86RotateRedisplay from xf86CrtcRotate" Acked-by: Olivier Fourdan <ofour...@redhat.com> Reviewed-by: Adam Jackson <a...@redhat.com> (cherry picked from commit 6a5e47c57d16de8b6a6a2636f3cbad1aebec32e2) - - - - - 948afd76 by Dave Airlie at 2020-02-06T18:02:12+01:00 modesetting: remove unnecessary error message, fix zaphod leases I introduced this error with the MST hotplug code, but it can trigger on zaphod setups, and is perfectly fine. There is no support for MST/hotplug on zaphod setups currently, so we can just skip over the dynamic connector handling here. However we shouldn't skip over the lease handling so move it into the codepath. Fixes: 9257b1252da9 ("modesetting: add dynamic connector hotplug support (MST) (v3)") Reviewed-by: Michel Dänzer <mdaen...@redhat.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 1cfdd1a96580733df3625bcea3384ffee3dc92df) - - - - - 428b5ce4 by Paul Kocialkowski at 2020-02-10T10:19:18+01:00 glamor: Propagate FBO allocation failure for picture to texture upload When uploading a picture to a texture, glamor_upload_picture_to_texture calls glamor_pixmap_ensure_fbo to ensure that there is backing FBO. The FBO will be allocated if the picture's drawable pixmap does not have one already, which can fail when there is no GL memory left. glamor_upload_picture_to_texture checks that the call succeeded and will enter the failure path if it did not. However, unlike many other functions in glamor, this one has ret set to TRUE initially, so it needs to be set to FALSE when a failure happens. Otherwise, the error is not propagated and the failure path return TRUE. This leads to a fault when trying to access the FBO pointer later on. Signed-off-by: Paul Kocialkowski <paul.kocialkow...@bootlin.com> (cherry picked from commit c98c7709c67d8ed6b7455ec700a49b58c396ec2c) - - - - - a7b165d9 by Paul Kocialkowski at 2020-02-10T10:20:04+01:00 glamor: Error out on out-of-memory when allocating PBO for FBO access Packed buffer allocation (which happens at glBufferData time with the buffer bound) can fail when there is no GL memory left. Pick up the error when it happens, print a proper error message, do some cleanup and bail. Signed-off-by: Paul Kocialkowski <paul.kocialkow...@bootlin.com> (cherry picked from commit bc2e12239f86e5a4acd220744f42eb83ba55d328) - - - - - ca034c2f by Paul Kocialkowski at 2020-02-10T10:20:30+01:00 glamor: Propagate glamor_prepare_access failures in copy helpers glamor_prepare_access can fail for a few reasons, especially when failing to allocate a PBO buffer. Take this in account and bail in the copy helpers that call the helper when a failure happens. Signed-off-by: Paul Kocialkowski <paul.kocialkow...@bootlin.com> (cherry picked from commit de6b3fac1f26075ce915006c914c4a4755617715) - - - - - d2a6c870 by Paul Kocialkowski at 2020-02-10T10:21:02+01:00 glamor: Fallback to system memory for RW PBO buffer allocation We currently support two modes of operation for RW PBO buffers: one that allocates a pack buffer with GL memory and one that uses system memory when the former is not supported. Since allocation with system memory is less likely to fail, add a fallback to system memory when GL memory failed instead of bailing out. Signed-off-by: Paul Kocialkowski <paul.kocialkow...@bootlin.com> (cherry picked from commit 8c4e8d9eff03cefc987f13c900b0a47403946127) - - - - - d44bbb47 by Eric Anholt at 2020-02-10T10:22:34+01:00 glamor: Fix a compiler warning since the recent OOM fixes. Signed-off-by: Eric Anholt <e...@anholt.net> (cherry picked from commit 3b26b90cb787a14fa5f8bb2033eab8ab6562a9a5) - - - - - 1ba5e528 by Maarten Lankhorst at 2020-02-19T10:17:36+01:00 modesetting: Disable atomic support by default The atomic driver has issues with modesetting when stealing connectors from a different crtc, a black screen when doing rotation on a different crtc, and in general is just a mapping of the legacy helpers to atomic. This is already done in the kernel, so just fallback to legacy by default until this is fixed. Please backport to 1.20, as we don't want to enable it for everyone there. It breaks for existing users. The fixes to make the xserver more atomic have been pending on the mailing list for ages. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110375 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110030 References: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/36/commits Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> (cherry picked from commit f0d78b47ac49977a6007f5fe081f00c6eb19a12e) - - - - - a93bce6b by Michel Dänzer at 2020-02-21T23:21:33+00:00 xwayland: Split up xwl_screen_post_damage into two phases The first phase sets the new surface properties for all damaged windows, then the second phase commits all surface updates. This is preparatory for the next change, there should be no observable change in behaviour (other than the order of Wayland protocol requests). Reviewed-by: Adam Jackson <a...@redhat.com> (cherry picked from commit f88d9b1f779835302e02e255fcd45989db7f488d) - - - - - 0238359b by Michel Dänzer at 2020-02-21T23:21:33+00:00 xwayland: Call glamor_block_handler from xwl_screen_post_damage In between the two phases introduced by the previous change. This makes sure all pending drawing to the new buffers is flushed before they're committed to the Wayland server. (cherry picked from commit a542224ea28e2e8ccaf5e0df85bf6c603e97599a) - - - - - 94dad4f0 by Dor Askayo at 2020-02-21T23:21:33+00:00 xwayland: clear pixmaps after creation in rootless mode When a pixmap is created with a backing FBO, the FBO should be cleared to avoid rendering uninitialized memory. This could happen when the pixmap is rendered without being filled in its entirety. One example is when a top-level window without a background is resized. The pixmap would be reallocated to prepare for more pixels, but uninitialized memory would be rendered in the resize offset until the client sends a frame that fills these additional pixels. Another example is when a new top-level window is created without a background. Uninitialized memory would be rendered after the pixmap is allocated and before the client sends its first frame. This issue is only apparent in OpenGL implementations that don't zero the VRAM of allocated buffers by default, such as RadeonSI. Signed-off-by: Dor Askayo <dor.ask...@gmail.com> Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/636 Reviewed-by: Michel Dänzer <mdaen...@redhat.com> (cherry picked from commit 0e9a0c203c2ae4eae12bdbb95428f398211c7bee) [ Michel Dänzer: * Squashed in commit ebf549db2d9341d99e0d0847b948dd798d98f7dc * Dropped code related to glamor_format, which only exists on master ] - - - - - 915cc107 by Michel Dänzer at 2020-03-02T18:01:10+01:00 xwayland: Add xwl_window_create_frame_callback helper This will be used by the following changes. No functional change intended. Reviewed-by: Olivier Fourdan <ofour...@redhat.com> (cherry picked from commit f80eea0529b2cfb805a9c7d4994a4235451131e3) - - - - - 99a6d6b1 by Michel Dänzer at 2020-03-02T18:07:21+01:00 xwayland: Use single frame callback for Present flips and normal updates Using a list of Present windows that need to be called back. This prepares for the following change, there should be no change in observed behaviour. v2: * Use xwl_window_create_frame_callback instead of making the frame_listener struct non-static (Olivier Fourdan) Reviewed-by: Olivier Fourdan <ofour...@redhat.com> (cherry picked from commit c5067feaeea115761f0a72f37407c6e5e943d1a1) - - - - - 2a185dd2 by Michel Dänzer at 2020-03-02T18:09:31+01:00 xwayland: Use frame callbacks for Present vblank events Instead of only the fallback timer. Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/854 v2: * Drop unused frame_callback member of struct xwl_present_window (Olivier Fourdan) Reviewed-by: Olivier Fourdan <ofour...@redhat.com> (cherry picked from commit 9b31358c52e951883bf7c01c953a9da080542244) - - - - - 1610ef1d by David Seifert at 2020-03-07T11:58:57-08:00 Fix building with `-fno-common` * GCC 10 will switch the default to `-fno-common`. https://gcc.gnu.org/PR85678 Bug: https://bugs.gentoo.org/705880 Signed-off-by: Matt Turner <matts...@gmail.com> - - - - - 3c48bd50 by Arthur Williams at 2020-03-07T21:36:04+00:00 dix: Check for NULL spriteInfo in GetPairedDevice There is a race when reseting the XServer that causes spriteInfo to be NULL in GetPairedDevice resulting a segfault and subsequent crash. The problem was noticed when opening a connection, creating master devices, destroying master devices and closing the connection during testing. Signed-off-by: Arthur Williams <taapart...@gmail.com> (cherry picked from commit e693c9657f98c334e9921ca2f8ebf710497c0c6a) - - - - - a0335716 by Jonas Ådahl at 2020-03-12T08:22:13+01:00 xwayland/glamor-gbm: Handle DRM_FORMAT_MOD_INVALID gracefully The compositor may send DRM_FORMAT_MOD_INVALID instead of a list of modifiers for various reasons. Handle this gracefully by ignoring it. Without this, if a compositor would send DRM_FORMAT_MOD_INVALID, it'd result in empty windows provided by Xwayland. Signed-off-by: Jonas Ådahl <jad...@gmail.com> Reviewed-by: Olivier Fourdan <ofour...@redhat.com> Reviewed-by: Michel Dänzer <mdaen...@redhat.com> (cherry picked from commit edf964434eac10ffbe27cc883e3ab95505669aee) - - - - - b2594859 by Michel Dänzer at 2020-03-18T09:39:02+01:00 xwayland: Delete all frame_callback_list nodes in xwl_unrealize_window We were only calling xwl_present_unrealize_window for the toplevel window, but the list can contain entries from child windows as well, in which case we were leaving dangling pointers to freed memory. Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/1000 Fixes: c5067feaeea1 "xwayland: Use single frame callback for Present flips and normal updates" Reviewed-by: Olivier Fourdan <ofour...@redhat.com> Tested-by: Olivier Fourdan <ofour...@redhat.com> (cherry picked from commit 5e91587302e85fd6f0e8d5ffbe30182e18c6913f) - - - - - 0c012f96 by Jon Turney at 2020-03-22T15:34:24-07:00 Add xf86OSInputThreadInit to stub os-support as well stub os support also needs to provide xf86OSInputThreadInit, omitted in ea1527a8 (cherry picked from commit c020769dbfb965740c8441d8242b738ef572a7c9) - - - - - 88372798 by Jon Turney at 2020-03-22T15:34:32-07:00 Fix old-style definition warning for xf86OSInputThreadInit() ../hw/xfree86/os-support/stub/stub_init.c: In function ‘xf86OSInputThreadInit’: ../hw/xfree86/os-support/stub/stub_init.c:29:1: warning: old-style function definition [-Wold-style-definition] (cherry picked from commit 7c266cafed14b38c039091651069ae9888c3a8ae) - - - - - f84ad082 by Matt Turner at 2020-03-29T13:02:03-07:00 xserver 1.20.8 Signed-off-by: Matt Turner <matts...@gmail.com> - - - - - 68dc35eb by Timo Aaltonen at 2020-03-30T14:07:36+03:00 Merge branch 'upstream-unstable' into debian-unstable - - - - - 7b1327a0 by Timo Aaltonen at 2020-03-30T14:08:33+03:00 bump the release - - - - - 869161ce by Timo Aaltonen at 2020-03-30T14:13:14+03:00 patches: Dropped patches applied upstream - fix-modesetting-build.diff - add-EGL_QUERY_DRIVER-check.diff - fix-rotate-crash.diff - - - - - ce0895e7 by Timo Aaltonen at 2020-03-30T14:58:21+03:00 control: Use debhelper-compat, bump to 12. - - - - - 5dcab2aa by Timo Aaltonen at 2020-03-30T15:48:37+03:00 rules: Migrate to dh_missing. - - - - - c6639ff4 by Timo Aaltonen at 2020-03-30T15:48:45+03:00 release to sid - - - - - 30 changed files: - configure.ac - debian/changelog - − debian/compat - debian/control - − debian/patches/add-EGL_QUERY_DRIVER-check.diff - − debian/patches/fix-modesetting-build.diff - − debian/patches/fix-rotate-crash.diff - debian/patches/series - debian/rules - dix/devices.c - exa/exa_accel.c - glamor/glamor.c - glamor/glamor.h - glamor/glamor_copy.c - glamor/glamor_fbo.c - glamor/glamor_picture.c - glamor/glamor_prepare.c - glamor/glamor_priv.h - glx/glxdri2.c - hw/dmx/config/dmxconfig.c - hw/dmx/config/xdmxconfig.c - hw/dmx/glxProxy/glxext.c - hw/xfree86/drivers/modesetting/driver.c - hw/xfree86/drivers/modesetting/driver.h - hw/xfree86/drivers/modesetting/drmmode_display.c - hw/xfree86/modes/xf86Rotate.c - hw/xfree86/os-support/bsd/bsd_init.c - hw/xfree86/os-support/hurd/hurd_init.c - hw/xfree86/os-support/linux/lnx_init.c - hw/xfree86/os-support/solaris/sun_vid.c The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/eaced025b0d32ed86706088a2c4410cf7b66d40b...c6639ff44de33df7b977a2dd30ab6c47d1594041 -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/-/compare/eaced025b0d32ed86706088a2c4410cf7b66d40b...c6639ff44de33df7b977a2dd30ab6c47d1594041 You're receiving this email because of your account on salsa.debian.org.
