diff options
author | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-02-21 16:47:08 +0200 |
---|---|---|
committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-07-16 02:24:12 -0700 |
commit | b8b0b4c42fc77d94b8deadaa46f795784f3bbb5e (patch) | |
tree | 0b351c35e4f8b2308efc02564a372644003157b2 /drivers/video/tegra/nvmap/nvmap_dev.c | |
parent | 7653853c08f7850aa229a363a23399f9a7495306 (diff) |
video: tegra: nvmap: Make IOMMU/IOVMM selectable in Kconfig
This patch allows nvmap to use the standard IOMMU API as its backend
engine instead of the legacy tegra IOVMM by Kconfig.
Enable TEGRA_IOMMU_{GART,SMMU} under IOMMU in config, and it
automatically disables IOVMM, instead.
Change-Id: I71112ef8072591aac4a93075623ca31c8851a960
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/114217
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_dev.c')
-rw-r--r-- | drivers/video/tegra/nvmap/nvmap_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c index 758bc3d8cba0..98b0bcc18ba5 100644 --- a/drivers/video/tegra/nvmap/nvmap_dev.c +++ b/drivers/video/tegra/nvmap/nvmap_dev.c @@ -1192,7 +1192,7 @@ static int nvmap_probe(struct platform_device *pdev) dev->iovmm_master.iovmm = tegra_iovmm_alloc_client(&pdev->dev, NULL, &(dev->dev_user)); -#ifdef CONFIG_TEGRA_IOVMM +#if defined(CONFIG_TEGRA_IOVMM) || defined(CONFIG_IOMMU_API) if (!dev->iovmm_master.iovmm) { e = PTR_ERR(dev->iovmm_master.iovmm); dev_err(&pdev->dev, "couldn't create iovmm client\n"); |