Remove intel iris driver and fall back to i915/i965

posapiano-ops · Sep 18, 2020 · 23783cc · 23783cc
1 parent 002e2a0
commit 23783cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/config/graphic b/config/graphic
@@ -33,7 +33,7 @@ get_graphicdrivers() {
   V4L2_SUPPORT="no"
 
   if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
-    GRAPHIC_DRIVERS="iris i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
@@ -64,13 +64,6 @@ get_graphicdrivers() {
     VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
-    GALLIUM_DRIVERS+=" iris"
-    XORG_DRIVERS+=" intel"
-    COMPOSITE_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
-
   if listcontains "${GRAPHIC_DRIVERS}" "lima"; then
     GALLIUM_DRIVERS+=" kmsro lima"
     V4L2_SUPPORT="yes"

diff --git a/distributions/Lakka/options b/distributions/Lakka/options
@@ -76,7 +76,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nouveau"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nouveau"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="no"

diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk
@@ -27,7 +27,7 @@ PKG_MESON_OPTS_TARGET="-Dlibkms=false \
                        -Dinstall-test-programs=false \
                        -Dudev=false"
 
-listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)" &&
+listcontains "${GRAPHIC_DRIVERS}" "(i915|i965)" &&
   PKG_MESON_OPTS_TARGET+=" -Dintel=true" || PKG_MESON_OPTS_TARGET+=" -Dintel=false"
 
 listcontains "${GRAPHIC_DRIVERS}" "(r200|r300|r600|radeonsi)" &&