diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 3 |
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 | ||
19 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" | 19 | SERIAL_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. | ||
21 | XSERVER = "xserver-xorg \ | 23 | XSERVER = "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] = "" | |||
98 | PACKAGECONFIG[v3d] = "" | 98 | PACKAGECONFIG[v3d] = "" |
99 | 99 | ||
100 | GALLIUMDRIVERS = "swrast" | 100 | GALLIUMDRIVERS = "swrast" |
101 | # gallium swrast was found to crash Xorg on startup in x32 qemu | ||
102 | GALLIUMDRIVERS_x86-x32 = "" | ||
103 | |||
101 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" | 104 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" |
102 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" | 105 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" |
103 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" | 106 | GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" |