diff options
| author | Gaurav Sarode <gsarode@nvidia.com> | 2014-04-30 14:41:26 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-01 15:58:22 -0700 |
| commit | 1f34270158c0b25491fc1ed62c5eb2e17367b791 (patch) | |
| tree | abde3377590410d9dc3f456223b7a55fcc17e8bd /arch/arm/mach-tegra/common.c | |
| parent | 0e7c15ce027f7aea6a52f1b1eb00d997caa6431a (diff) | |
arm: tegra:Enable VPR init when CMA is disabled.
VPR init was previously enabled when TLK was disabled. CMA was
supposed to do the allocation and initialization for VPR.
But when CMA is disabled, vpr allocation is done by bootloader and
init is done by kernel. But CMA is disabled on some platforms
using TLK, this was causing VPR allocation failure.
Change-Id: I1d61da4d1698bb2475f1b4897964382b12a5d528
Signed-off-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-on: http://git-master/r/403842
Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index f8e7b0658833..2d492abb562e 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -1121,7 +1121,8 @@ int tegra_get_sku_override(void) return sku_override; } -#ifndef CONFIG_TRUSTED_LITTLE_KERNEL +#if !defined(CONFIG_TRUSTED_LITTLE_KERNEL) || \ + !defined(CONFIG_NVMAP_USE_CMA_FOR_CARVEOUT) static int __init tegra_vpr_arg(char *options) { char *p = options; |