Merge pull request #9500 from HiassofT/le13-cleanup-mali

drop support for unused mali graphics driver

config/graphic

@@ -78,10 +78,6 @@ get_graphicdrivers() {
     V4L2_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "mali"; then
-    V4L2_SUPPORT="yes"
-  fi
-
   if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
     XORG_DRIVERS+=" nvidia"
     VULKAN_DRIVERS_CONFIG+=" nvidia"

packages/graphics/libmali/package.mk

@@ -1,41 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libmali"
-PKG_VERSION="d4000def121b818ae0f583d8372d57643f723fdc"
-PKG_SHA256="4f2103fc927cc006ee5c9b647e899f50b0dcaeee127fec713387d06a333eb404"
-PKG_ARCH="arm aarch64"
-PKG_LICENSE="nonfree"
-PKG_SITE="https://github.com/LibreELEC/libmali"
-PKG_URL="https://github.com/LibreELEC/libmali/archive/${PKG_VERSION}.tar.gz"
-PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family"
-PKG_STAMP="${MALI_FAMILY}"
-
-PKG_DEPENDS_TARGET="libdrm"
-
-if listcontains "${MALI_FAMILY}" "(t620|t720)"; then
-  PKG_DEPENDS_TARGET+=" wayland"
-fi
-
-listcontains "${MALI_FAMILY}" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard"
-listcontains "${MALI_FAMILY}" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard"
-listcontains "${MALI_FAMILY}" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost"
-
-PKG_CMAKE_OPTS_TARGET="-DMALI_VARIANT=${MALI_FAMILY// /;}"
-
-if [ "${TARGET_ARCH}" = "aarch64" ]; then
-  PKG_CMAKE_OPTS_TARGET+=" -DMALI_ARCH=aarch64-linux-gnu"
-fi
-
-post_makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/bin
-    cp -v ${PKG_DIR}/scripts/libmali-setup ${INSTALL}/usr/bin
-
-  if [ $(ls -1q ${INSTALL}/usr/lib/libmali-*.so | wc -l) -gt 1 ]; then
-    ln -sfv /var/lib/libmali/libmali.so ${INSTALL}/usr/lib/libmali.so
-  fi
-}
-
-post_install() {
-  enable_service libmali-setup.service
-}

packages/graphics/libmali/scripts/libmali-setup

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-GPUINFO=/sys/kernel/debug/mali/version
-[ ! -f "$GPUINFO" ] && GPUINFO=$(find /sys/devices/platform -name gpuinfo)
-
-echo "GPUINFO: $GPUINFO"
-[ ! -f "$GPUINFO" ] && exit
-
-GPU=$(cat $GPUINFO)
-echo "GPU: $GPU"
-
-case $GPU in
-  Mali-400*) LIB="libmali-utgard-400-*.so" ;;
-  Mali-450*) LIB="libmali-utgard-450-*.so" ;;
-  Mali-T60x*) LIB="libmali-midgard-t60x-*.so" ;;
-  Mali-T62x*) LIB="libmali-midgard-t620-*.so" ;;
-  Mali-T72x*) LIB="libmali-midgard-t720-*.so" ;;
-  Mali-T76x*r0p0*) LIB="libmali-midgard-t76x-*-r0p0-*.so" ;;
-  Mali-T76x*r1p0*) LIB="libmali-midgard-t76x-*-r1p0-*.so" ;;
-  Mali-T82x*) LIB="libmali-midgard-t82x-*.so" ;;
-  Mali-T83x*) LIB="libmali-midgard-t83x-*.so" ;;
-  Mali-T86x*) LIB="libmali-midgard-t86x-*.so" ;;
-  Mali-T88x*) LIB="libmali-midgard-t88x-*.so" ;;
-  Mali-G31*) LIB="libmali-bifrost-g31-*.so" ;;
-  Mali-G51*) LIB="libmali-bifrost-g51-*.so" ;;
-  Mali-G52*) LIB="libmali-bifrost-g52-*.so" ;;
-  Mali-G71*) LIB="libmali-bifrost-g71-*.so" ;;
-  Mali-G72*) LIB="libmali-bifrost-g72-*.so" ;;
-  Mali-G76*) LIB="libmali-bifrost-g76-*.so" ;;
-esac
-
-echo "LIB: $LIB"
-[ -z "$LIB" ] && exit
-
-LIBMALI=$(find /usr/lib -name $LIB)
-
-echo "LIBMALI: $LIBMALI"
-[ ! -f "$LIBMALI" ] && exit
-
-mkdir -p /var/lib/libmali
-ln -sf $LIBMALI /var/lib/libmali/libmali.so

packages/graphics/libmali/system.d/libmali-setup.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Setup symlink for ARM Mali library
-Before=graphical.target
-After=multi-user.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/libmali-setup
-
-[Install]
-WantedBy=multi-user.target

packages/linux-drivers/mali-bifrost/package.mk

@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="mali-bifrost"
-PKG_VERSION="af7c8d8bcdedd792a8d101d3a11876bb8bcbe3da" # BX301A01B-SW-99002-r16p0-01rel0
-PKG_SHA256="712ba83f28bf687e2147f0f586678421b0d2cb5620423e93e7b7c9ddf35c1da5"
-PKG_ARCH="arm aarch64"
-PKG_LICENSE="GPL"
-PKG_SITE="https://developer.arm.com/products/software/mali-drivers/bifrost-kernel"
-PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/${PKG_VERSION}.tar.gz"
-PKG_LONGDESC="mali-bifrost: the Linux kernel driver for ARM Mali Bifrost GPUs"
-PKG_TOOLCHAIN="manual"
-PKG_IS_KERNEL_PKG="yes"
-
-case ${PROJECT} in
-  Amlogic)
-    PKG_MALI_PLATFORM_CONFIG="config.meson-g12a"
-    ;;
-esac
-
-make_target() {
-  kernel_make KDIR=$(kernel_path) -C ${PKG_BUILD} \
-       CONFIG_NAME=${PKG_MALI_PLATFORM_CONFIG}
-}
-
-makeinstall_target() {
-  DRIVER_DIR=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard/
-
-  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
-    cp ${DRIVER_DIR}/mali_kbase.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}/
-}

packages/linux-drivers/mali-midgard/package.mk

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="mali-midgard"
-PKG_VERSION="2c2accf67356463ee661627b8705429256011dcb" # TX011-SW-99002-r28p0-01rel0
-PKG_SHA256="506ec1e388f491f53a9acf8ca2077bd135a6d31f688ed7139ed0cd77f5c44d72"
-PKG_ARCH="arm aarch64"
-PKG_LICENSE="GPL"
-PKG_SITE="https://developer.arm.com/products/software/mali-drivers/"
-PKG_URL="https://github.com/LibreELEC/mali-midgard/archive/${PKG_VERSION}.tar.gz"
-PKG_LONGDESC="mali-midgard: Linux drivers for Mali Midgard GPUs"
-PKG_TOOLCHAIN="manual"
-PKG_IS_KERNEL_PKG="yes"
-
-case ${PROJECT} in
-  Allwinner)
-    PKG_CONFIGS="CONFIG_MALI_PLATFORM_NAME=sunxi"
-    ;;
-  Amlogic)
-    PKG_CONFIGS="CONFIG_MALI_PLATFORM_NAME=meson"
-    ;;
-  Rockchip)
-    PKG_CONFIGS="CONFIG_MALI_PLATFORM_NAME=rk"
-    ;;
-esac
-
-post_patch() {
-  # rename kernel module to not clash with mali-bifrost
-  find ${PKG_BUILD} -name Kbuild -exec sed -i 's/mali_kbase.o/mali_midgard.o/g; s/mali_kbase-/mali_midgard-/g' {} \;
-}
-
-make_target() {
-  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \
-    EXTRA_CFLAGS="${PKG_EXTRA_CFLAGS}" \
-    CONFIG_MALI_MIDGARD=m ${PKG_CONFIGS}
-}
-
-makeinstall_target() {
-  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \
-    INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
-    modules_install
-}

packages/linux-drivers/mali-utgard/package.mk

@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="mali-utgard"
-PKG_VERSION="e8419af528f62a7e44c966b6853b59a2e78c47bf"
-PKG_SHA256="18e034cf2b131fa54c5579534ee09e5a054906051130e5e425d6d49f8d8f9eca"
-PKG_ARCH="arm aarch64"
-PKG_LICENSE="GPL"
-PKG_SITE="https://developer.arm.com/products/software/mali-drivers/utgard-kernel"
-PKG_URL="https://github.com/LibreELEC/mali-utgard/archive/${PKG_VERSION}.tar.gz"
-PKG_LONGDESC="mali-utgard: Linux drivers for Mali Utgard GPUs"
-PKG_TOOLCHAIN="manual"
-PKG_IS_KERNEL_PKG="yes"
-
-case ${PROJECT} in
-  Allwinner)
-    PKG_MALI_PLATFORM="sunxi"
-    ;;
-  Amlogic)
-    PKG_MALI_PLATFORM="meson"
-    ;;
-  Rockchip)
-    PKG_MALI_PLATFORM="rk"
-    PKG_EXTRA_CFLAGS="-DCONFIG_MALI_DT"
-    PKG_CONFIGS="CONFIG_MALI_DT=y"
-    ;;
-esac
-
-make_target() {
-  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali \
-    MALI_PLATFORM_FILES=platform/${PKG_MALI_PLATFORM}/${PKG_MALI_PLATFORM}.c GIT_REV="" \
-    EXTRA_CFLAGS="-DMALI_FAKE_PLATFORM_DEVICE=1 -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH -DCONFIG_MALI400=1 -DCONFIG_MALI450=1 -DCONFIG_MALI470=1 ${PKG_EXTRA_CFLAGS}" \
-    CONFIG_MALI400=m CONFIG_MALI450=y CONFIG_MALI470=y CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y ${PKG_CONFIGS}
-}
-
-makeinstall_target() {
-  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali/ \
-    INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
-    modules_install
-}

packages/linux/package.mk

@@ -142,12 +142,6 @@ pre_make_target() {
   ${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT_FIND
   ${PKG_BUILD}/scripts/config ${OPTION} CONFIG_ISCSI_IBFT
 
-  # disable lima/panfrost if libmali is configured
-  if [ "${OPENGLES}" = "libmali" ]; then
-    ${PKG_BUILD}/scripts/config --disable CONFIG_DRM_LIMA
-    ${PKG_BUILD}/scripts/config --disable CONFIG_DRM_PANFROST
-  fi
-
   # disable wireguard support if not enabled
   if [ ! "${WIREGUARD_SUPPORT}" = yes ]; then
     ${PKG_BUILD}/scripts/config --disable CONFIG_WIREGUARD

projects/ARM/devices/ARMv7/options

@@ -16,6 +16,3 @@
 
   # KODI Player implementation to use
     KODIPLAYER_DRIVER="$OPENGLES"
-
-  # Mali GPU family
-    MALI_FAMILY="450"

projects/ARM/devices/ARMv8/options

@@ -26,7 +26,3 @@
 
   # KODI Player implementation to use
     KODIPLAYER_DRIVER="$OPENGLES"
-
-  # Mali GPU family
-    MALI_FAMILY="450"
-    

projects/Allwinner/devices/A64/options

@@ -30,9 +30,6 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
     OPENGLES="mesa"
 
-  # Mali GPU family
-    MALI_FAMILY="400"
-
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="$OPENGLES"
 

projects/Allwinner/devices/H2-plus/options

@@ -43,10 +43,7 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
     OPENGLES="mesa"
 
-  # Mali GPU family
+ # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
-    MALI_FAMILY="400"
-
-  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="$OPENGLES"
 
   # set the addon project

projects/Allwinner/devices/H3/options

@@ -43,9 +43,6 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
     OPENGLES="mesa"
 
-  # Mali GPU family
-    MALI_FAMILY="400"
-
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="$OPENGLES"
 

projects/Allwinner/devices/H5/options

@@ -30,9 +30,6 @@
   # OpenGL-ES implementation to use
     OPENGLES="mesa"
 
-  # Mali GPU family
-    MALI_FAMILY="450"
-
   # KODI Player implementation to use
     KODIPLAYER_DRIVER="$OPENGLES"
 

projects/Allwinner/devices/R40/options

@@ -40,9 +40,6 @@
   # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
     OPENGLES="mesa"
 
-  # Mali GPU family
-    MALI_FAMILY="400"
-
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="$OPENGLES"
 

projects/Amlogic/devices/AMLGX/options

@@ -27,8 +27,5 @@
   # KODI Player implementation to use
     KODIPLAYER_DRIVER="$OPENGLES"
 
-  # Mali GPU family
-    MALI_FAMILY="450 t820 g31 g52"
-
   # Set the addon project
     ADDON_PROJECT="ARMv8"

projects/Rockchip/devices/RK3288/options

@@ -21,8 +21,7 @@
     KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker.dtb"
     KERNEL_MAKE_EXTRACMD+=" rockchip/rk3288-tinker-s.dtb"
 
-  # Mali GPU family
+  # Graphic drivers to use
-    MALI_FAMILY="t760"
     GRAPHIC_DRIVERS="panfrost"
 
   # kernel serial console

projects/Rockchip/devices/RK3328/options

@@ -26,8 +26,7 @@
   # Kernel target
     KERNEL_TARGET="Image"
 
-  # Mali GPU family
+  # Graphic drivers to use
-    MALI_FAMILY="450"
     GRAPHIC_DRIVERS="lima"
 
   # kernel serial console

projects/Rockchip/devices/RK3399/options

@@ -26,8 +26,7 @@
   # Kernel target
     KERNEL_TARGET="Image"
 
-  # Mali GPU family
+  # Graphic drivers to use
-    MALI_FAMILY="t860"
     GRAPHIC_DRIVERS="panfrost"
 
   # kernel serial console

projects/Rockchip/options

@@ -36,7 +36,7 @@
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
-  # OpenGL-ES implementation to use (no / libmali / mesa)
+  # OpenGL-ES implementation to use (no / mesa)
     OPENGLES="${OPENGLES:-mesa}"
 
   # Vulkan implementation to use (vulkan-loader / no)

projects/Samsung/devices/Exynos/options

@@ -20,6 +20,3 @@
 
   # KODI Player implementation to use
     KODIPLAYER_DRIVER="$OPENGLES"
-
-  # Mali GPU family
-    MALI_FAMILY="t620"