summaryrefslogtreecommitdiffstats
path: root/meta
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 17:10:28 +0100
commitf32128bda2a035b01d2dbf7bc73738a310eb955c (patch)
treede1b8cc408c78357e329bc3472aadf65a1e8c6b5 /meta
parentb0bad37101129dce533bbc406ace779c4a1aa789 (diff)
downloadpoky-f32128bda2a035b01d2dbf7bc73738a310eb955c.tar.gz
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 <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/qemux86-64.conf5
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc3
2 files changed, 7 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"
18 18
19SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" 19SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
20 20
21# Install swrast and glx if opengl is in DISTRO_FEATURES and x32 is not in use.
22# This is because gallium swrast driver was found to crash X server on startup in qemu x32.
21XSERVER = "xserver-xorg \ 23XSERVER = "xserver-xorg \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
25 bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \
23 xf86-video-cirrus \ 26 xf86-video-cirrus \
24 xf86-video-fbdev \ 27 xf86-video-fbdev \
25 xf86-video-vmware \ 28 xf86-video-vmware \
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index fcd19884f5..8040d78992 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -98,6 +98,9 @@ PACKAGECONFIG[vc4] = ""
98PACKAGECONFIG[v3d] = "" 98PACKAGECONFIG[v3d] = ""
99 99
100GALLIUMDRIVERS = "swrast" 100GALLIUMDRIVERS = "swrast"
101# gallium swrast was found to crash Xorg on startup in x32 qemu
102GALLIUMDRIVERS_x86-x32 = ""
103
101GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" 104GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
102GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" 105GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}"
103GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" 106GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}"