Merge pull request #2156 from sydarn/libmali-g24

libmali-g24 for rk3326 and rk3566

projects/ROCKNIX/packages/graphics/libmali/package.mk

@@ -4,7 +4,6 @@
 # Copyright (C) 2024 ROCKNIX (https://github.com/ROCKNIX)
 
 PKG_NAME="libmali"
-PKG_VERSION="g13p0"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://github.com/ROCKNIX/libmali"
 # zip format makes extract very fast (<1s). tgz takes 20 seconds to scan the whole file
@@ -18,6 +17,20 @@ PKG_PATCH_DIRS+=" ${DEVICE}"
 # patchelf is incompatible with strip, but is needed to ensure apps call wrapped functions
 PKG_BUILD_FLAGS="-strip"
 
+case "$(DEVICE)" in
+  S922X)
+    PKG_VERSION="r51p0"
+    MALI_FAMILY="meson"
+    PKG_DEPENDS_TARGET+=" vulkan-wsi-layer vulkan-tools"
+  ;;
+  RK3588)
+    PKG_VERSION="g13p0"
+  ;;
+  *) # RK3326 and RK3566
+    PKG_VERSION="g24p0"
+  ;;
+esac
+
 case "${DISPLAYSERVER}" in
   wl)
     PLATFORM="wayland-gbm"
@@ -31,12 +44,6 @@ case "${DISPLAYSERVER}" in
     ;;
 esac
 
-if [ "${DEVICE}" = "S922X" ] && [ "${ARCH}" = "aarch64" ]; then
-  PKG_VERSION="r51p0"
-  MALI_FAMILY="meson"
-  PKG_DEPENDS_TARGET+=" vulkan-wsi-layer vulkan-tools"
-fi
-
 PKG_MESON_OPTS_TARGET+=" -Darch=${ARCH} -Dgpu=${MALI_FAMILY} -Dversion=${PKG_VERSION} -Dplatform=${PLATFORM} \
                        -Dkhr-header=false -Dvendor-package=true -Dwrappers=enabled -Dhooks=true"
 

projects/ROCKNIX/packages/hardware/quirks/platforms/RK3326/090-ui_service

@@ -6,4 +6,5 @@
 ### Set the default device configuration
 cat <<EOF >/storage/.config/profile.d/090-ui_service
 UI_SERVICE="sway.service essway.service"
+MALI_WAYLAND_AFBC=0
 EOF

projects/ROCKNIX/packages/hardware/quirks/platforms/RK3566/090-ui_service

@@ -6,4 +6,5 @@
 ### Set the default device configuration
 cat <<EOF >/storage/.config/profile.d/090-ui_service
 UI_SERVICE="sway.service essway.service"
+MALI_WAYLAND_AFBC=0
 EOF

projects/ROCKNIX/packages/hardware/quirks/profile.d/999-export

@@ -57,4 +57,5 @@ export  OS_VERSION \
 	PAN_MESA_DEBUG \
 	WLR_DRM_DEVICES \
 	WLR_BACKENDS \
-	WLR_CON
+	WLR_CON \
+    MALI_WAYLAND_AFBC