diff options
| author | Somasundaram S <somasundaram@nvidia.com> | 2013-07-02 12:04:21 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:31:33 -0700 |
| commit | bf29d8a8ff1110812f52d14a1debce293cadb2d3 (patch) | |
| tree | 4f5b65863a816ee4a6c610153f24d3341c898946 /drivers/media/video | |
| parent | 69d15d30d2dd73be313a5d1e89bc6b33d111ac8c (diff) | |
video: tegra: nvavp: Support for new T124 carveout bins
Add support for AVP OS bin when carveout is 1GB and
SMMU is disabled in T124
Use default heap as carveout when SMMU is disabled
Bug 1322157
Change-Id: I31be0fa2faab5b0f3d4542fd4323e53d9487e670
Signed-off-by: Somasundaram S <somasundaram@nvidia.com>
Reviewed-on: http://git-master/r/244166
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-by: Gajanan Bhat <gbhat@nvidia.com>
Reviewed-by: Somu Sundaram <somasundarams@nvidia.com>
Tested-by: Somu Sundaram <somasundarams@nvidia.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index 828bd4fed7a8..3fe0f17b91fd 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -934,6 +934,8 @@ static int nvavp_os_init(struct nvavp_info *nvavp) /* Find nvmem carveout */ if (!pfn_valid(__phys_to_pfn(0x8e000000))) { nvavp->os_info.phys = 0x8e000000; + } else if (!pfn_valid(__phys_to_pfn(0xfde00000))) { + nvavp->os_info.phys = 0xfde00000; } else if (!pfn_valid(__phys_to_pfn(0x9e000000))) { nvavp->os_info.phys = 0x9e000000; } else if (!pfn_valid(__phys_to_pfn(0xbe000000))) { @@ -1581,7 +1583,7 @@ static int tegra_nvavp_probe(struct platform_device *ndev) #elif defined(CONFIG_TEGRA_AVP_KERNEL_ON_SMMU) /* Tegra3 with SMMU */ heap_mask = NVMAP_HEAP_IOVMM; #else /* nvmem= carveout */ - heap_mask = 0; + heap_mask = NVMAP_HEAP_CARVEOUT_GENERIC; #endif switch (heap_mask) { case NVMAP_HEAP_IOVMM: |