diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2010-05-13 12:10:38 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-14 20:10:05 -0700 |
| commit | fd8c38e1779e9eeef1fafc639b117187de202a55 (patch) | |
| tree | 4446a194ecabd06d823b1de0fee4734dd1fe3b82 | |
| parent | 7c5ade31d650992a7486e2db4f9458207039a6ce (diff) | |
[ARM/tegra] Enable DEVNVMAP_RECLAIM_UNPINNED_VM in android
Enable GART virtualization in android
Bug 678065
texture_alloc test is run to verify this.
Change-Id: Ic2c3b32b9c6c1a090f2c7884d24123ce38558e68
Reviewed-on: http://git-master/r/1376
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra_harmony_android_defconfig | 7 | ||||
| -rwxr-xr-x | arch/arm/configs/tegra_whistler_android_defconfig | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig index 2aecea233911..ee68bb3ccab7 100644 --- a/arch/arm/configs/tegra_harmony_android_defconfig +++ b/arch/arm/configs/tegra_harmony_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Fri Apr 23 16:47:46 2010 +# Thu May 13 11:37:42 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -202,6 +202,7 @@ CONFIG_TEGRA_NVEC=y CONFIG_TEGRA_NVEC_USER=y # CONFIG_TEGRA_ODM_VIBRATE is not set CONFIG_TEGRA_PCI=y +# CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU is not set CONFIG_TEGRA_ODM_HARMONY=y # CONFIG_TEGRA_ODM_WHISTLER is not set # CONFIG_TEGRA_ODM_CONCORDE is not set @@ -865,7 +866,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -#CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_TEGRA is not set # CONFIG_KEYBOARD_TEGRA_GPIO is not set CONFIG_KEYBOARD_TEGRA_NVEC=y @@ -943,7 +944,7 @@ CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set CONFIG_DEVNVMAP=y # CONFIG_DEVNVMAP_PARANOID is not set -# CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM is not set +CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM=y # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index d98a89f93985..3eeed0849d9d 100755 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Fri Apr 30 17:38:10 2010 +# Fri May 14 11:15:28 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -805,7 +805,7 @@ CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set CONFIG_DEVNVMAP=y # CONFIG_DEVNVMAP_PARANOID is not set -# CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM is not set +CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM=y # CONFIG_SERIAL_NONSTANDARD is not set # |