summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlistair Francis <Alistair.Francis@wdc.com>2019-01-16 22:55:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-18 16:24:40 +0000
commit02117d2b62487f1c41c94387dac429f2f10d3bc5 (patch)
treee3cdc49858ed8dbcfb35d0807037e7c8a178f375 /meta
parent90206d9ece648df00dc8cfcd7c4b80c30dd39c1c (diff)
downloadpoky-02117d2b62487f1c41c94387dac429f2f10d3bc5.tar.gz
mesa: Allow building the r600 driver
The r600 DRI driver does not require LLVM, so remove it from the LLVM dependency PACKAGE_CONFIG. Also remove the x86 requirement on the drivers as they are work on non-x86 systems. This was tested on a RISC-V board. (From OE-Core rev: 001b544db55101ab7a3f5f5910de6548542b6e2a) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc16
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 06c47e6dd4..d9e492e94e 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -85,14 +85,18 @@ PACKAGECONFIG[imx] = ""
85GALLIUMDRIVERS = "swrast" 85GALLIUMDRIVERS = "swrast"
86GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" 86GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
87GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" 87GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}"
88GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" 88
89PACKAGECONFIG[r600] = "" 89# radeonsi requires LLVM
90GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"
90GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" 91GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
91GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 92GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
92GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 93
93GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 94PACKAGECONFIG[r600] = ""
94GALLIUMDRIVERS_append_x86 = ",virgl" 95
95GALLIUMDRIVERS_append_x86-64 = ",virgl" 96GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
97GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"
98GALLIUMDRIVERS_append = ",virgl"
99
96# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 100# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
97PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 101PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
98MESA_LLVM_RELEASE ?= "6.0" 102MESA_LLVM_RELEASE ?= "6.0"