From c3e40302fee4ad9775fdfa8bd4d00f9825e3ca6c Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Mon, 11 Nov 2019 15:18:59 +0100
Subject: [PATCH] Allwinner: use mesa for H6 devices

---
 projects/Allwinner/devices/A64/options | 6 ++++++
 projects/Allwinner/devices/H3/options  | 6 ++++++
 projects/Allwinner/devices/H6/options  | 7 +++++--
 projects/Allwinner/options             | 8 +-------
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options
index 2d9c32c14e..916de3b3a9 100644
--- a/projects/Allwinner/devices/A64/options
+++ b/projects/Allwinner/devices/A64/options
@@ -31,5 +31,11 @@
   # ATF platform
     ATF_PLATFORM="sun50i_a64"
 
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="libmali"
+
   # Mali GPU family
     MALI_FAMILY="400"
+
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="$OPENGLES"
diff --git a/projects/Allwinner/devices/H3/options b/projects/Allwinner/devices/H3/options
index 9656c4cbdb..8cecb974f4 100644
--- a/projects/Allwinner/devices/H3/options
+++ b/projects/Allwinner/devices/H3/options
@@ -37,5 +37,11 @@
   # Kernel target
     KERNEL_TARGET="zImage"
 
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="libmali"
+
   # Mali GPU family
     MALI_FAMILY="400"
+
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="$OPENGLES"
diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options
index 82487625c2..c068b54d9a 100644
--- a/projects/Allwinner/devices/H6/options
+++ b/projects/Allwinner/devices/H6/options
@@ -31,5 +31,8 @@
   # ATF platform
     ATF_PLATFORM="sun50i_h6"
 
-  # Mali GPU family
-    MALI_FAMILY="t720"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="mesa"
+
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="$OPENGLES"
diff --git a/projects/Allwinner/options b/projects/Allwinner/options
index c5976ed8d6..f559f5616b 100644
--- a/projects/Allwinner/options
+++ b/projects/Allwinner/options
@@ -40,9 +40,6 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
-  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
-    OPENGLES="libmali"
-
   # Displayserver to use (x11 / no)
     DISPLAYSERVER="no"
 
@@ -52,10 +49,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=""
-
-  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
-    KODIPLAYER_DRIVER="$OPENGLES"
+    GRAPHIC_DRIVERS="panfrost"
 
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,