diff options
| author | Richard Liu <r66033@freescale.com> | 2014-05-12 15:02:38 +0800 |
|---|---|---|
| committer | Richard Liu <r66033@freescale.com> | 2014-05-12 18:22:19 +0800 |
| commit | 2f375da7662aadc6a1a694f322c9486ca61e112a (patch) | |
| tree | 3e37e2f5eb060530dbf7639172982bcaae79cfec | |
| parent | 6fbb4058a21d24384e4c8f2d3fd8ef33c2141302 (diff) | |
ENGR00313001-1 add CONFIG_GPU_LOW_MEMORY_KILLER and default enable
add CONFIG_GPU_LOW_MEMORY_KILLER and by default enable
GPU low memory killer.
Signed-off-by: Richard Liu <r66033@freescale.com>
| -rw-r--r-- | arch/arm/configs/android_common_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/imx6_hdmidongle_android_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/imx6s_android_defconfig | 1 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/Kconfig | 11 |
5 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/configs/android_common_defconfig b/arch/arm/configs/android_common_defconfig index 3c19cccc5868..a9ab8e4a1157 100644 --- a/arch/arm/configs/android_common_defconfig +++ b/arch/arm/configs/android_common_defconfig @@ -231,6 +231,7 @@ CONFIG_ANDROID_RESERVED_MEMORY_ACCOUNT=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_MXC_GPU_VIV=y +CONFIG_GPU_LOW_MEMORY_KILLER=y CONFIG_MAGIC_SYSRQ=y CONFIG_KEYS=y diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index de8aaf3058b2..449b03bf4c88 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -3002,6 +3002,11 @@ CONFIG_MXC_ASRC=y CONFIG_MXC_GPU_VIV=y # +# GPU low memory killer support +# +CONFIG_GPU_LOW_MEMORY_KILLER=y + +# # ANATOP_THERMAL # CONFIG_ANATOP_THERMAL=y diff --git a/arch/arm/configs/imx6_hdmidongle_android_defconfig b/arch/arm/configs/imx6_hdmidongle_android_defconfig index fc10a02edd2e..33dbb334de5f 100644 --- a/arch/arm/configs/imx6_hdmidongle_android_defconfig +++ b/arch/arm/configs/imx6_hdmidongle_android_defconfig @@ -2996,6 +2996,11 @@ CONFIG_MXC_ASRC=y CONFIG_MXC_GPU_VIV=y # +# GPU low memory killer support +# +CONFIG_GPU_LOW_MEMORY_KILLER=y + +# # ANATOP_THERMAL # CONFIG_ANATOP_THERMAL=y diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig index 8efe08a7702e..2cb007c84509 100644 --- a/arch/arm/configs/imx6s_android_defconfig +++ b/arch/arm/configs/imx6s_android_defconfig @@ -373,6 +373,7 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_MXC_ASRC=y CONFIG_MXC_MLB150=m CONFIG_MXC_GPU_VIV=y +CONFIG_GPU_LOW_MEMORY_KILLER=y CONFIG_MXC_MIPI_CSI2=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y diff --git a/drivers/mxc/gpu-viv/Kconfig b/drivers/mxc/gpu-viv/Kconfig index 682d8eda0ab2..b63590a345d9 100644 --- a/drivers/mxc/gpu-viv/Kconfig +++ b/drivers/mxc/gpu-viv/Kconfig @@ -6,4 +6,15 @@ config MXC_GPU_VIV ---help--- Say Y to get the GPU driver support. +config GPU_LOW_MEMORY_KILLER + tristate "Reserved memory account to Low memory Killer" + depends on ANDROID + default n + ---help--- + Resigter reserved memory account to low memory killer, These + reserved memory is mainly used by GPU driver, but it's not + account by low memory killer, so even it takes much memory, + it will not killed. add this to fix this, it will kill the + large memory app in background. + endmenu |