summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-28 17:24:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 13:37:42 +0100
commit045011ed29c0ab45892ad0881a4a8987f2adc977 (patch)
tree34e36cad203ff6d533768bd6ff07b136ae27d6c8 /meta/conf
parent04c01b6cc5be3e6d45d0e04571640648a5655a8b (diff)
downloadopenembedded-core-contrib-045011ed29c0ab45892ad0881a4a8987f2adc977.tar.gz
mesa: disable gallium swrast driver on x86 x32
It was found to crash the X server on startup under qemu. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/qemux86-64.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 4b50e664e4..e7979997f2 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -18,8 +18,11 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
+# Install swrast and glx if opengl is in DISTRO_FEATURES and x32 is not in use.
+# This is because gallium swrast driver was found to crash X server on startup in qemu x32.
XSERVER = "xserver-xorg \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
+ bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \
xf86-video-cirrus \
xf86-video-fbdev \
xf86-video-vmware \