diff options
| author | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-07-24 12:48:50 +0300 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2012-08-07 10:21:35 -0700 |
| commit | abb6a85f077757e5d30f9507406fc533ea4954ee (patch) | |
| tree | b115927dfd50fd90c9dcf2bc4c5e76f2ff0377eb /drivers/video/tegra | |
| parent | 5ff96f6242f63d43481f672a888e69cad531caad (diff) | |
video: tegra: nvmap: Fix breakage for T20
NVMAP_CONVERT_CARVEOUT_TO_IOVMM is only available for IOMMU less SoCs.
This was introduced by (in 'main'):
commit b8b0b4c42fc77d94b8deadaa46f795784f3bbb5e
video: tegra: nvmap: Make IOMMU/IOVMM selectable in Kconfig
Bug 1017112
Change-Id: I2a6f101b15085ece600f77690bc77adc042eb29f
Reviewed-on: http://git-master/r/117976
(cherry picked from commit a68ae587edbc3ca5d3216d39c462abd84f469027)
Reviewed-on: http://git-master/r/121409
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Tested-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'drivers/video/tegra')
| -rw-r--r-- | drivers/video/tegra/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig index 6109078deb47..b5540a5793b2 100644 --- a/drivers/video/tegra/Kconfig +++ b/drivers/video/tegra/Kconfig @@ -143,7 +143,7 @@ config TEGRA_DSI config NVMAP_CONVERT_CARVEOUT_TO_IOVMM bool "Convert carveout to IOVMM" - depends on TEGRA_NVMAP && (TEGRA_IOVMM || IOMMU_API) + depends on TEGRA_NVMAP && (TEGRA_IOVMM_SMMU || IOMMU_API) default y help Say Y here to force to convert carveout memory requests to |