xserver: Branch 'master' - 4 commits
Adam Jackson
ajax at kemper.freedesktop.org
Wed Mar 28 20:36:17 UTC 2018
configure.ac | 22 +++++++++++++++-------
glamor/glamor_egl.c | 4 +++-
hw/xfree86/common/xf86Config.c | 5 +++++
hw/xfree86/common/xf86Privstr.h | 1 +
hw/xfree86/man/xorg.conf.man | 7 +++++++
meson.build | 2 +-
6 files changed, 32 insertions(+), 9 deletions(-)
New commits:
commit debf75bd0b0ddfec82dad9580efa7d19479b55df
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Mar 28 15:47:33 2018 -0400
xserver 1.20 RC2
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/configure.ac b/configure.ac
index defb707a2..828d15e95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.19.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2018-02-28"
-RELEASE_NAME="Broccoli Rabe Lasagna"
+AC_INIT([xorg-server], 1.19.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2018-03-28"
+RELEASE_NAME="Ceci Garganelli"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/meson.build b/meson.build
index 9b8da6764..6ad98d23e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.19.99.901',
+ version: '1.19.99.902',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
commit 726839459cb887a60361cb4779f9871c03f372b1
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Mar 28 16:11:18 2018 -0400
autotools: Derive xkb configuration from xkbcomp.pc
... if available, falling back to the current heuristics otherwise. This
_finally_ gets me to being able to run util/modular/release.sh without
overriding $prefix.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/configure.ac b/configure.ac
index 7087107e3..defb707a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -471,9 +471,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [
AC_MSG_CHECKING([for default font path])
AC_MSG_RESULT([$FONTPATH])
-AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
+AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: auto)]),
[ XKBPATH="$withval" ],
- [ XKBPATH="${datadir}/X11/xkb" ])
+ [ XKBPATH="auto" ])
AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
[ XKBOUTPUT="$withval" ],
[ XKBOUTPUT="compiled" ])
@@ -1391,11 +1391,19 @@ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+if test "x$XKBPATH" = "xauto"; then
+ XKBPATH=$(pkg-config --variable datadir xkbcomp || echo ${datadir})/X11/xkb
+fi
+
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
AC_ARG_WITH(xkb-bin-directory,
- AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program (default: ${bindir})]),
+ AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program (default: auto)]),
[XKB_BIN_DIRECTORY="$withval"],
- [XKB_BIN_DIRECTORY="$bindir"])
+ [XKB_BIN_DIRECTORY="auto"])
+
+if test "x$XKB_BIN_DIRECTORY" = "xauto"; then
+ XKB_BIN_DIRECTORY=$(pkg-config --variable bindir xkbcomp || echo ${bindir})
+fi
AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
commit d11d5bb80d21f2aaa54ddf2f26a50aa6ef31d2fa
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Mar 28 12:46:01 2018 -0400
glamor: Hide new DRI behind Option "Debug" "dmabuf_capable"
... for xfree86, at least for now. Things appear to work for Xwayland
but not yet for modesetting. Hopefully we can fix that before 1.20 but
in the meantime this makes testing both paths easier than a rebuild.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 2ea3efc58..4a550932a 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -35,6 +35,7 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <xf86.h>
+#include <xf86Priv.h>
#include <xf86drm.h>
#define EGL_DISPLAY_NO_X_MESA
@@ -960,7 +961,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
"EGL_EXT_image_dma_buf_import") &&
epoxy_has_egl_extension(glamor_egl->display,
"EGL_EXT_image_dma_buf_import_modifiers"))
- glamor_egl->dmabuf_capable = TRUE;
+ glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
+ "dmabuf_capable");
#endif
glamor_egl->saved_free_screen = scrn->FreeScreen;
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 46ddd0ec9..958926243 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -498,6 +498,9 @@ The options recognised by this section are:
.BI "Option \*qDebug\*q \*q" string \*q
This comma-separated list provides a way to control various debugging switches
from the config file.
+At the moment the only defined value is
+.B dmabuf_capable
+which instructs glamor to enable some unstable buffer management code.
.TP 7
.BI "Option \*qDefaultServerLayout\*q \*q" layout\-id \*q
This specifies the default
commit df13ea7da9174d2e1c732985d9b7a9a35a6916bc
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Mar 28 12:46:00 2018 -0400
xfree86: Add Option "Debug" to ServerFlags
This provides a generic way to control obscure runtime behavior knobs
without making interface promises.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 05991d319..2c1d335dc 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -645,6 +645,7 @@ typedef enum {
FLAG_AUTO_ADD_GPU,
FLAG_MAX_CLIENTS,
FLAG_IGLX,
+ FLAG_DEBUG,
} FlagValues;
/**
@@ -702,6 +703,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
{0}, FALSE},
+ {FLAG_DEBUG, "Debug", OPTV_STRING,
+ {0}, FALSE},
{-1, NULL, OPTV_NONE,
{0}, FALSE},
};
@@ -850,6 +853,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
}
#endif
+ xf86Info.debug = xf86GetOptValString(FlagOptions, FLAG_DEBUG);
+
/* if we're not hotplugging, force some input devices to exist */
xf86Info.forceInputDevices = !(xf86Info.autoAddDevices &&
xf86Info.autoEnableDevices);
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 0842e1ebb..21c2e1fe4 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -97,6 +97,7 @@ typedef struct {
MessageType dri2From;
Bool autoAddGPU;
+ const char *debug;
} xf86InfoRec, *xf86InfoPtr;
/* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 518d5bb78..46ddd0ec9 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -495,6 +495,10 @@ Options with command line equivalents are overridden when their command
line equivalent is used.
The options recognised by this section are:
.TP 7
+.BI "Option \*qDebug\*q \*q" string \*q
+This comma-separated list provides a way to control various debugging switches
+from the config file.
+.TP 7
.BI "Option \*qDefaultServerLayout\*q \*q" layout\-id \*q
This specifies the default
.B ServerLayout
More information about the xorg-commit
mailing list