From e645005fe60f1b0c1423a0980dd5bf2b09cf25a8 Mon Sep 17 00:00:00 2001 From: Liangbin Lian Date: Wed, 22 Oct 2025 16:01:12 +0800 Subject: [PATCH] package/mali-drivers: fix MIN, MAX redefined on linux 6.6.109+ Signed-off-by: Liangbin Lian --- package/kernel/mali-drivers/Makefile | 2 +- .../patches/016-fix-MIN-MAX-redefined.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 package/kernel/mali-drivers/patches/016-fix-MIN-MAX-redefined.patch diff --git a/package/kernel/mali-drivers/Makefile b/package/kernel/mali-drivers/Makefile index c30fefb859..a226af6038 100644 --- a/package/kernel/mali-drivers/Makefile +++ b/package/kernel/mali-drivers/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mali-drivers PKG_VERSION:=24.11.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_HASH:=2fe6146c141639eea4a2625be073387b8de3b8f3d9384ce495c411c7bbd6da61 PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz diff --git a/package/kernel/mali-drivers/patches/016-fix-MIN-MAX-redefined.patch b/package/kernel/mali-drivers/patches/016-fix-MIN-MAX-redefined.patch new file mode 100644 index 0000000000..a6b1ab1655 --- /dev/null +++ b/package/kernel/mali-drivers/patches/016-fix-MIN-MAX-redefined.patch @@ -0,0 +1,53 @@ +From 95facf639030d05ab0c65ba158f36a219d4f3faa Mon Sep 17 00:00:00 2001 +From: jjm2473 +Date: Wed, 22 Oct 2025 15:56:32 +0800 +Subject: [PATCH] fix MIN,MAX redefined on linux 6.6.109+ + +--- + drivers/gpu/arm/bifrost/mali_malisw.h | 2 ++ + drivers/gpu/arm/midgard/mali_malisw.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/drivers/gpu/arm/bifrost/mali_malisw.h b/drivers/gpu/arm/bifrost/mali_malisw.h +index d9db189..b9aaf8b 100644 +--- a/drivers/gpu/arm/bifrost/mali_malisw.h ++++ b/drivers/gpu/arm/bifrost/mali_malisw.h +@@ -28,6 +28,7 @@ + + #include + ++#if KERNEL_VERSION(6, 6, 109) > LINUX_VERSION_CODE + /** + * MIN - Return the lesser of two values. + * @x: value1 +@@ -51,6 +52,7 @@ + * instead. + */ + #define MAX(x, y) ((x) < (y) ? (y) : (x)) ++#endif + + /** + * CSTD_UNUSED - Function-like macro for suppressing unused variable warnings. +diff --git a/drivers/gpu/arm/midgard/mali_malisw.h b/drivers/gpu/arm/midgard/mali_malisw.h +index 9945293..670fb43 100644 +--- a/drivers/gpu/arm/midgard/mali_malisw.h ++++ b/drivers/gpu/arm/midgard/mali_malisw.h +@@ -41,6 +41,7 @@ + #define SIZE_MAX (~(size_t)0) + #endif /* LINUX_VERSION_CODE */ + ++#if KERNEL_VERSION(6, 6, 109) > LINUX_VERSION_CODE + /** + * MIN - Return the lesser of two values. + * +@@ -60,6 +61,7 @@ + * instead. + */ + #define MAX(x, y) ((x) < (y) ? (y) : (x)) ++#endif + + /** + * @hideinitializer +-- +2.46.0 +