Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Feb 2020 17:32:04 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r527097 - head/x11-servers/xorg-server
Message-ID:  <202002251732.01PHW4hn035922@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Tue Feb 25 17:32:03 2020
New Revision: 527097
URL: https://svnweb.freebsd.org/changeset/ports/527097

Log:
  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

Modified:
  head/x11-servers/xorg-server/Makefile   (contents, props changed)
  head/x11-servers/xorg-server/pkg-message   (contents, props changed)

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Tue Feb 25 16:13:36 2020	(r527096)
+++ head/x11-servers/xorg-server/Makefile	Tue Feb 25 17:32:03 2020	(r527097)
@@ -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-conf
 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 --disab
 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
@@ -104,6 +105,12 @@ PLIST_SUB+=	SPARC64=""
 .else
 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;/' \

Modified: head/x11-servers/xorg-server/pkg-message
==============================================================================
--- head/x11-servers/xorg-server/pkg-message	Tue Feb 25 16:13:36 2020	(r527096)
+++ head/x11-servers/xorg-server/pkg-message	Tue Feb 25 17:32:03 2020	(r527097)
@@ -21,6 +21,8 @@ To make it persistent across reboots, add the followin
 
 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
 }
 ]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002251732.01PHW4hn035922>