From 0a946c6850c691b87b28c56bdf76d8efea1e2521 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Fri, 17 Dec 2021 22:34:29 +0800
Subject: [PATCH] upgrade mesa3d

---
 gpu_config.sh                 | 6 ++++--
 init.redroid.rc               | 5 +++++
 mediacodec.policy             | 1 +
 redroid.mk                    | 9 +++++++--
 redroid_arm64/BoardConfig.mk  | 4 +++-
 redroid_x86_64/BoardConfig.mk | 4 +++-
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/gpu_config.sh b/gpu_config.sh
index 0524d23..558cff7 100755
--- a/gpu_config.sh
+++ b/gpu_config.sh
@@ -8,10 +8,10 @@ setup_vulkan() {
             setprop ro.hardware.vulkan intel
             ;;
         amdgpu)
-            setprop ro.hardware.vulkan radv
+            setprop ro.hardware.vulkan radeon
             ;;
         virtio_gpu)
-            # google venus
+            setprop ro.hardware.vulkan virtio
             ;;
         *)
             echo "not supported driver: $1"
@@ -25,6 +25,7 @@ setup_render_node() {
         echo "force render node: $node"
 
         setprop gralloc.gbm.device $node
+        chmod 666 $node
 
         # setup vulkan
         cd /sys/kernel/debug/dri
@@ -44,6 +45,7 @@ setup_render_node() {
                     node="/dev/dri/renderD$d"
                     echo "use render node: $node"
                     setprop gralloc.gbm.device $node
+                    chmod 666 $node
                     return 0
                     ;;
             esac
diff --git a/init.redroid.rc b/init.redroid.rc
index 82c54ce..482e018 100644
--- a/init.redroid.rc
+++ b/init.redroid.rc
@@ -6,6 +6,11 @@ on early-init
     # 32bit app require this, remove for 64bit only redroid
     write /proc/sys/kernel/pid_max 65535
 
+    chmod 666 /dev/ashmem
+    chmod 666 /dev/ptmx
+    chmod 666 /dev/pts/ptmx
+
+    exec -- /bin/rm -rf /dev/input
     # inputflinger require this dir
     mkdir /dev/input
 
diff --git a/mediacodec.policy b/mediacodec.policy
index 1bb018a..fc1b14e 100644
--- a/mediacodec.policy
+++ b/mediacodec.policy
@@ -2,3 +2,4 @@
 uname: 1
 sysinfo: 1
 kcmp: 1
+sched_getaffinity: 1
diff --git a/redroid.mk b/redroid.mk
index bd9a991..1b2e5f4 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -64,8 +64,13 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
     vulkan.pastel \
-    libGLES_mesa \
-    vulkan.radv \
+    libEGL_mesa \
+    libGLESv1_CM_mesa \
+    libGLESv2_mesa \
+    libgallium_dri \
+    libglapi \
+    vulkan.radeon \
+    vulkan.virtio \
     ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index 20014af..8044bfe 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -18,7 +18,9 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_GPU_DRIVERS := virgl radeonsi
+BOARD_MESA3D_USES_MESON_BUILD := true
+BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi
+BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd
 
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
 
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index c40478b..7451cd9 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -14,7 +14,9 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_GPU_DRIVERS := i915 i965 r300g r600g virgl iris radeonsi
+BOARD_MESA3D_USES_MESON_BUILD := true
+BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi i915 iris
+BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd intel
 
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml