From f32128bda2a035b01d2dbf7bc73738a310eb955c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 28 Aug 2019 17:24:40 +0200 Subject: mesa: disable gallium swrast driver on x86 x32 It was found to crash the X server on startup under qemu. (From OE-Core rev: 045011ed29c0ab45892ad0881a4a8987f2adc977) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/conf') 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 \ -- cgit v1.2.3-54-g00ecf