From c46d90ef1a84143de76ef0fbdd8b6e2b54703407 Mon Sep 17 00:00:00 2001 From: Chris Dragan Date: Thu, 13 Apr 2023 06:31:58 -0700 Subject: [PATCH] misc: mods: update from Perforce to 4.16 Change-Id: Ib0126f696879706d7834b1676bc17f6cbfd8194b Signed-off-by: Chris Dragan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2887660 Reviewed-by: Bharat Nihalani GVS: Gerrit_Virtual_Submit --- drivers/misc/mods/mods_config.h | 4 +++- include/uapi/misc/mods.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mods/mods_config.h b/drivers/misc/mods/mods_config.h index b4d9615c..10e16b3f 100644 --- a/drivers/misc/mods/mods_config.h +++ b/drivers/misc/mods/mods_config.h @@ -111,7 +111,9 @@ # define MODS_ENABLE_BPMP_MRQ_API 1 #endif -#if KERNEL_VERSION(6, 1, 0) > MODS_KERNEL_VERSION +#if KERNEL_VERSION(5, 15, 0) > MODS_KERNEL_VERSION +# define MODS_HAS_FB_SET_SUSPEND 1 +#elif (KERNEL_VERSION(6, 1, 0) > MODS_KERNEL_VERSION) && !defined(CONFIG_CHROME_PLATFORMS) # define MODS_HAS_FB_SET_SUSPEND 1 #endif diff --git a/include/uapi/misc/mods.h b/include/uapi/misc/mods.h index d15ce23a..0de2e493 100644 --- a/include/uapi/misc/mods.h +++ b/include/uapi/misc/mods.h @@ -25,7 +25,7 @@ /* Driver version */ #define MODS_DRIVER_VERSION_MAJOR 4 -#define MODS_DRIVER_VERSION_MINOR 15 +#define MODS_DRIVER_VERSION_MINOR 16 #define MODS_DRIVER_VERSION ((MODS_DRIVER_VERSION_MAJOR << 8) | \ ((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \ (MODS_DRIVER_VERSION_MINOR % 10))