GitLab

Since commit dabc7d8b, Xwayland has tried GLES2 as a fallback if GL
version does not match the required version (2.1) so that some hardware
could still benefit from GLAMOR acceleration using GLES2.

This unfortunately has caused various regressions on some hardware,
namely Intel 945GM.

Revert that fallback to just disable GLAMOR if GL version is lower than
2.1 to behave like xwayland-21.1.x did.

This partly reverts commit dabc7d8b

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
See-also: xorg/xserver#1288

Preparation for a 22.1 release.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>

Michel Dänzer authored Oct 23, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 001f0c89)

Michel Dänzer authored Dec 18, 2020 and Olivier Fourdan committed Jan 18, 2022

We're keeping it for unit tests, but we don't want to ship it from this
branch.

Also disable Xvfb in CI for ninja test. It's still built and used for
unit tests as part of ninja dist, but we don't want to run XTS on Xvfb.

(cherry picked from commit 0408fcb3)

Michel Dänzer authored Oct 23, 2020 and Olivier Fourdan committed Jan 18, 2022

And simplify build_glamor logic, we don't need the separate
glamor_option variable anymore.

(cherry picked from commit fdc61c5a)
(cherry picked from commit 274d54d1)

Michel Dänzer authored Nov 17, 2020 and Olivier Fourdan committed Jan 18, 2022

Not used on this branch.

(cherry picked from commit be7257c5)

Michel Dänzer authored Nov 17, 2020 and Olivier Fourdan committed Jan 18, 2022

Not used on this branch.

(cherry picked from commit aa49cd5a)

Michel Dänzer authored Oct 23, 2020 and Olivier Fourdan committed Jan 18, 2022

Not used anymore on this branch.

(cherry picked from commit 23296633)

Michel Dänzer authored Oct 23, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 9335ee79)

Michel Dänzer authored Jul 03, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 4f4b8e00)

Michel Dänzer authored Jul 03, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 8f480147)

This partly reverts commit d3933a24.

Michel Dänzer authored Jul 03, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 69cc6a6c)

Michel Dänzer authored Jul 03, 2020 and Olivier Fourdan committed Jan 18, 2022

(cherry picked from commit 6cae4b39)

Xwayland may open a fair amount of file descriptors for passing Wayland
buffers, even more so when using the `wl_shm` either for the pointer
cursors or for when GLAMOR is not usable.

As a result, Xwayland may hit the (soft) limit of file descriptors
leading to a Wayland protocol error and the termination of Xwayland.

To mitigate that risk, raise the limit to the maximum (hard) limit of
file descriptors (unless of course the limit was set explicitly from the
command line with "-lf").

Note that for completeness, the Wayland compositor may have to do the
same, otherwise the limit might get reached on the compositor side as
well.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Simon Ser <contact@emersion.fr>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: xorg/xserver#1283

Michel Dänzer authored Jan 14, 2022 and Michel Dänzer committed Jan 14, 2022

The sRGB ones came before the non-sRGB ones, which broke some clients.

Closes: #1225

Acked-by: Olivier Fourdan <ofourdan@redhat.com>

Michel Dänzer authored Dec 24, 2021 and Michel Dänzer committed Dec 24, 2021

If the Wayland compositor doesn't send a pending frame event, e.g.
because the Wayland surface isn't visible anywhere, it could happen that
the timer kept getting pushed back and never fired. This resulted in an
enormous list of pending vblank events, which could take minutes to
process when the frame event finally arrived.

Closes: xorg/xserver#1110

Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Jaap Buurman <jaapbuurman@gmail.com>

If there is one platform device, which is not paused nor resumed,
systemd_logind_vtenter() will never get called.
This break suspend/resume, and switching to VT on system with Nvidia
proprietary driver.
This is a regression introduced by f5bd0396

So now call systemd_logind_vtenter() if there are no paused
platform devices.

Closes: xorg/xserver#1271
Fixes: f5bd0396

 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

This was introduced by commit 8eb1396d

Closes: #1269
Fixes: da9d012a

 - xf86/logind: Fix drm_drop_master before vt_reldisp
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Matthieu Herrb authored Nov 16, 2021 and Povilas Kanapickas committed Dec 19, 2021

This fixes a crash when a DeviceEvent struct converted to
InteralEvent was beeing copied as InternalEvent (and thus
causing out of bounds reads) in ActivateGrabNoDelivery()
in events.c: 3876    *grabinfo->sync.event = *real_event;

Possible fix for #1253

Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>

Adam Jackson authored Oct 26, 2021 and Povilas Kanapickas committed Dec 19, 2021

For depth 30 in particular it's not uncommon for the DDX to not have
a configured pixmap format. Since the client expects to back both
GLXPixmaps and GLXPbuffers with X Pixmaps, trying to use an x2rgb10
fbconfig would fail along various paths to CreatePixmap. Filter these
fbconfigs out so the client can't ask for something that we know won't
work.

Michel Dänzer authored Dec 14, 2021 and Michel Dänzer committed Dec 17, 2021

There were just 3 outliers, let's try to prevent them from spreading.

Andrea Monaco authored Dec 15, 2021 and Alan Coopersmith committed Dec 16, 2021

This is minor, but that error message says a wrong function name.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

Sam James authored Dec 07, 2021 and Povilas Kanapickas committed Dec 14, 2021

Initially reported downstream in Gentoo. Manifests with errors like:
```
gnu/bin/ld: hw/xfree86/common/libxorg_common.a(xf86fbBus.c.o): in function `xf86ClaimFbSlot':
xf86fbBus.c:(.text+0x20): undefined reference to `sbusSlotClaimed'
/usr/lib/gcc/sparc-unknown-linux-gnu/11.2.0/../../../../sparc-unknown-linux-gnu/bin/ld: xf86fbBus.c:(.text+0x2c): undefined reference to `sbusSlotClaimed'
```

While we use the headers in meson.build, we don't reference xf86sbusBus.c
which defines the missing symbols like sbusSlotClaimed.

Bug: https://bugs.gentoo.org/828513

Signed-off-by: Sam James <sam@gentoo.org>

ZDI-CAN-14192, CVE-2021-4008

This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

ZDI-CAN-14951, CVE-2021-4010

This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

ZDI-CAN-14950, CVE-2021-4009

This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

ZDI-CAN-14952, CVE-2021-4011

This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

With the new numbering scheme, XORG_VERISON_SNAP doesn't mean
a pre-release version anymore.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>

Drew DeVault authored Jul 25, 2019 and Olivier Fourdan committed Dec 07, 2021

This commit allows X11 clients running through Xwayland to lease
non-desktop connectors from the Wayland compositor by implementing
support for drm-lease-v1.
In order to not deadlock with the Wayland compositor if its response
to a lease request is delayed, the new interface in _rrScrPriv
introduced in the last commit is used, which makes it possible to
block the X11 client while a response is pending.
Leasing normal outputs is not yet supported, all connectors offered
for lease will be advertised as non-desktop.
Co-authored-by: Xaver Hugl <xaver.hugl@gmail.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>

Xaver Hugl authored Dec 02, 2021 and Olivier Fourdan committed Dec 07, 2021

Add a new interface to _rrScrPriv to make it possible for the server to
delay answering a lease request, at the cost of blocking the client. This
is needed for implementing drm-lease-v1, as the Wayland protocol has no
defined time table for responding to lease requests.
Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>

Xaver Hugl authored Oct 22, 2021 and Olivier Fourdan committed Dec 07, 2021

This is needed for implementing drm-lease-v1
Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>

Xaver Hugl authored Oct 22, 2021 and Olivier Fourdan committed Dec 07, 2021

This is needed for implementing drm-lease-v1
Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>

Matthieu Herrb authored Dec 05, 2021 and Povilas Kanapickas committed Dec 06, 2021

XF86_CRTC_CONFIG_PTR() will derefence privates[-1] in this case.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>

This was overlooked when converting the function to use libxcvt.
Bring back name initialization from old code.

This was causing a segfault in xf86LookupMode() if modes where
name is NULL are present the modePool list.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>

The compositor may send us wl_seat and its capabilities before sending
e.g. relative_pointer_manager or pointer_gesture interfaces. This would
result in devices being created in capabilities handler, but listeners
not, because the interfaces weren't available at the time. So we
manually attempt to setup listeners again.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

The implementation is relatively straightforward because both wayland
and Xorg use libinput semantics for touchpad gestures.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

This worked with autotools, but not meson build system.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>

Attempting to run fvwm on a x61/965gm with xserver 1.21.1 with the
modesetting driver on OpenBSD/amd64 would cause the xserver to
reliably crash.

I tracked this down to the free() calls introduced in
2906ee5e
(d1ca47e1 in branch).

clang also warns about this:
glamor_program.c:296:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:290:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:288:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:277:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:296:13: warning: variable 'fs_prog_string' is used uninitialized whe...