diff options
| author | Kaz Fukuoka <kfukuoka@nvidia.com> | 2012-03-20 13:59:07 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-22 18:38:27 -0700 |
| commit | 23bd23f414d1b3e677ac42b3ef1dfd8e09553d88 (patch) | |
| tree | 28d1b9d3af430a6810125c692181a42c34a8ebd1 /drivers/media | |
| parent | ccb9b8579a1ab4401614024ba3de51683e7446b4 (diff) | |
video: tegra: nvavp: Fix for high SMMU aparture
- With this fix NVAVP works with CONFIG_TEGRA_SMMU_BASE_AT_E0000000.
Change-Id: I9c267bc9b008a57f6f0cc4e9b27dbee0501e6a77
Signed-off-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-on: http://git-master/r/91316
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index 63ddcdee3b28..407e35b40c4e 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -1,7 +1,7 @@ /* * drivers/media/video/tegra/nvavp/nvavp_dev.c * - * Copyright (C) 2011 NVIDIA Corp. + * Copyright (C) 2011-2012 NVIDIA Corp. * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any @@ -1163,7 +1163,12 @@ static int tegra_nvavp_probe(struct nvhost_device *ndev) #endif switch (heap_mask) { case NVMAP_HEAP_IOVMM: + +#ifdef CONFIG_TEGRA_SMMU_BASE_AT_E0000000 + iovmm_addr = 0xeff00000; +#else iovmm_addr = 0x0ff00000; +#endif /* Tegra3 A01 has different SMMU address */ if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA3 |