From 7006ddcef62ce5600a5fccefd0767f2e9ea12aba Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 1 Sep 2017 17:54:01 +0000 Subject: [PATCH] Revert "misc: mnh: Allocate partial carveout for kernel use" This reverts commit 5a8d54cf414441f37142a86c71a97f1f2dafa1e7. bug 63347709 Change-Id: I2aedc8ff6e147d3162de10377edcda3190c82425 --- arch/arm64/boot/dts/htc/msm8998-htc-common.dtsi | 2 +- arch/arm64/boot/dts/lge/msm8998-taimen.dtsi | 2 +- include/uapi/linux/mnh-sm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/htc/msm8998-htc-common.dtsi b/arch/arm64/boot/dts/htc/msm8998-htc-common.dtsi index db3cb0e8bc5b..d88e9784de31 100755 --- a/arch/arm64/boot/dts/htc/msm8998-htc-common.dtsi +++ b/arch/arm64/boot/dts/htc/msm8998-htc-common.dtsi @@ -94,7 +94,7 @@ easel_mem: easel_mem@95c00000 { compatible = "removed-dma-pool"; - reg = <0 0x95c00000 0 0x6000000>; /* 96 MB */ + reg = <0 0x95c00000 0 0x4000000>; label = "easel_mem"; }; diff --git a/arch/arm64/boot/dts/lge/msm8998-taimen.dtsi b/arch/arm64/boot/dts/lge/msm8998-taimen.dtsi index 28dfccd2b9fa..63deeedfe185 100644 --- a/arch/arm64/boot/dts/lge/msm8998-taimen.dtsi +++ b/arch/arm64/boot/dts/lge/msm8998-taimen.dtsi @@ -56,7 +56,7 @@ easel_mem: easel_mem@96000000 { linux,contiguous-region; - reg = <0 0x96000000 0 0x6000000>; /* 96 MB */ + reg = <0 0x96000000 0 0x4000000>; label = "easel_mem"; }; diff --git a/include/uapi/linux/mnh-sm.h b/include/uapi/linux/mnh-sm.h index 20661bef574e..d9d5c9ca29e8 100644 --- a/include/uapi/linux/mnh-sm.h +++ b/include/uapi/linux/mnh-sm.h @@ -38,7 +38,7 @@ #define MNH_SM_IOC_MAGIC 'T' #define MNH_SM_MAX 8 -#define MNH_ION_BUFFER_SIZE (SZ_32M + SZ_16M) /* 48 MB for kernel */ +#define MNH_ION_BUFFER_SIZE SZ_64M #define FW_VER_SIZE 16 #define MNH_SM_IOC_GET_STATE \