diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-02-25 17:32:03 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-02-25 17:32:03 +0000 |
| commit | e8888f06e29e95203c4d4cdd28b641f7b8e0a048 (patch) | |
| tree | c51c5a52f438ebd4447cc47639a33b8912c9aa45 /x11-servers | |
| parent | 2913a9c32827d4345d8ae3eaa720a35f5a936d79 (diff) | |
| download | ports-e8888f06e29e95203c4d4cdd28b641f7b8e0a048.tar.gz ports-e8888f06e29e95203c4d4cdd28b641f7b8e0a048.zip | |
x11-servers/xorg-server: Restore FIXDRM as an off-by-default knob
This is a workaround for a problem with certain systems [1] after
x11-servers/xorg-server was upgraded to 1.20.7. Other workarounds are
described in PR 244306.
[1]
These systems have been reported to have problems:
Sandy Bridge
Ivy Bridge
Broadwell
Kaby Lake
Whiskey Lake
PR: 244306
Submitted by: wulf
Reported by: philippe.michel7@free.fr
Approved by: x11 (zeising)
Differential Revision: https://reviews.freebsd.org/D23834
Notes
Notes:
svn path=/head/; revision=527097
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 13 | ||||
| -rw-r--r-- | x11-servers/xorg-server/pkg-message | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 57afb6011056..ed6e44977437 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.20.7 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -20,7 +20,7 @@ RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ SLAVE_PORT?= no OPTIONS_SUB= yes -OPTIONS_DEFINE= SUID +OPTIONS_DEFINE= FIXDRM SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD UDEV OPTIONS_DEFAULT= SUID @@ -32,6 +32,7 @@ OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} SUID_DESC= Install setuid wrapper to allow startx as non-root CONF_DESC= Backend to use for input device configuration DEVD_DESC= Use devd for autoconfiguration of input devices +FIXDRM_DESC= Enable glamor workaround for drm-kmod bug UDEV_DESC= Use udev via libudev-devd for autoconfiguration of input devices DEVD_CONFIGURE_ENABLE= config-devd @@ -81,7 +82,7 @@ CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+= --disable-xorg -OPTIONS_EXCLUDE= DEVD UDEV SUID +OPTIONS_EXCLUDE= DEVD FIXDRM UDEV SUID # Set PLIST for slave ports so they only need to set PLIST_FILES PLIST= ${.CURDIR}/pkg-plist .endif @@ -105,6 +106,12 @@ PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64="@comment " .endif +post-patch-FIXDRM-on: +# Workaround lockups with modesetting driver using drm-kmod 4.16+ with partial +# revert of commit 86b2d8740a330deafe8a9bbf0402705a43efbb42 + @${REINPLACE_CMD} '/glamor_make_pixmap_exportable/ s/FALSE/TRUE/' \ + ${WRKSRC}/glamor/glamor_egl.c + post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure diff --git a/x11-servers/xorg-server/pkg-message b/x11-servers/xorg-server/pkg-message index c9aa03ba366e..0c6dbd2afcff 100644 --- a/x11-servers/xorg-server/pkg-message +++ b/x11-servers/xorg-server/pkg-message @@ -21,6 +21,8 @@ To make it persistent across reboots, add the following to /etc/sysctl.conf: kern.evdev.rcpt_mask=6 +If your X session locks up after starting certain applications, rebuild this +port with the FIXDRM option turned on. EOM } ] |