summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap
diff options
context:
space:
mode:
authorKaz Fukuoka <kfukuoka@nvidia.com>2011-05-14 17:46:24 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:45:02 -0800
commit87de6935a3764a98504a54ebdb2468370fa902a8 (patch)
tree43b2cb83da358c46e6f84640591d05a95c05d5ba /drivers/video/tegra/nvmap
parentef904466ea970cfd116c1310cbec0d38c2dccbe3 (diff)
media: tegra: avp: Allocate IOVMM first for AVP
bug 827505 Original-Change-Id: If6d4fd137b72c3a08bf8fb1094d8dd31ab361f1c Reviewed-on: http://git-master/r/31633 Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com> Tested-by: Kaz Fukuoka <kfukuoka@nvidia.com> Reviewed-by: Frank Thomas Bourgeois <fbourgeois@nvidia.com> Rebase-Id: R563eaa39b299d89133f7a9fb4b1c7129e8ddb71e
Diffstat (limited to 'drivers/video/tegra/nvmap')
-rw-r--r--drivers/video/tegra/nvmap/nvmap_dev.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c
index aeba57c85482..1ebb1f4dcf82 100644
--- a/drivers/video/tegra/nvmap/nvmap_dev.c
+++ b/drivers/video/tegra/nvmap/nvmap_dev.c
@@ -1207,6 +1207,14 @@ static int nvmap_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev);
nvmap_dev = dev;
+
+#if defined(CONFIG_TEGRA_AVP_KERNEL_ON_SMMU)
+ {
+ void avp_early_init(void);
+ avp_early_init();
+ }
+#endif
+
return 0;
fail_heaps:
for (i = 0; i < dev->nr_carveouts; i++) {