package/mali-drivers: fix MIN, MAX redefined on linux 6.6.109+

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
This commit is contained in:
Liangbin Lian 2025-10-22 16:01:12 +08:00
parent 47e0e3e83f
commit e645005fe6
2 changed files with 54 additions and 1 deletions

View File

@ -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

View File

@ -0,0 +1,53 @@
From 95facf639030d05ab0c65ba158f36a219d4f3faa Mon Sep 17 00:00:00 2001
From: jjm2473 <jjm2473@gmail.com>
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 <linux/version.h>
+#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