mesa: enable gallium intel drivers when building for x86

Iris is the default, recommended option for Skylake and newer nowadays,
i915 gallium is favoured over classic i915, and soon classic i965 will
be replaced by crocus gallium driver for i965-to-Haswell GPUs.

(From OE-Core rev: 670878b5919c2a67a2fea0b8e1f032e324fad5aa)

(From OE-Core rev: 5fdc061856348c0dab4dea7cfc0e9fdc1c95d85f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 5 insertions, 2 deletions

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 5700cc9673..b3c8c292ff 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -131,6 +131,9 @@ PACKAGECONFIG[v3d] = ""
 GALLIUMDRIVERS = "swrast"
 # gallium swrast was found to crash Xorg on startup in x32 qemu
 GALLIUMDRIVERS_x86-x32 = ""
+# Add crocus when 21.2 is out to the list below to support the full range of Intel GPUs
+GALLIUMDRIVERS_append_x86_class-target = ",i915,iris"
+GALLIUMDRIVERS_append_x86-64_class-target = ",i915,iris"
 
 GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
 GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
diff --git a/meta/recipes-graphics/mesa/mesa_21.1.2.bb b/meta/recipes-graphics/mesa/mesa_21.1.2.bb
index 1993d6cbd0..28abc91a87 100644
--- a/meta/recipes-graphics/mesa/mesa_21.1.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_21.1.2.bb
@@ -1,5 +1,5 @@
 require ${BPN}.inc
 
-DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965,i915"
-DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965,i915"
+DRIDRIVERS_append_x86_class-target = ",r100,r200,nouveau,i965"
+DRIDRIVERS_append_x86-64_class-target = ",r100,r200,nouveau,i965"