diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2018-05-19 04:07:10 +0300 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2018-07-09 10:31:10 +0200 |
| commit | 4466b1f0e022f94a026bd700fee34bff15cdc4ef (patch) | |
| tree | f89e9a1ee8a9e32d9831116f376da4bc8c047583 | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
gpu: host1x: Skip IOMMU initialization if firewall is enabled
Host1x's CDMA can't access the command buffers if IOMMU and Host1x
firewall are enabled in the kernels config because firewall doesn't map
the copied buffer into IOVA space. Fix this by skipping IOMMU
initialization if firewall is enabled as firewall merges sparse cmdbufs
into a single contiguous buffer and hence IOMMU isn't needed in this case.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/gpu/host1x/dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index f1d5f76e9c33..d88073e7d22d 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -218,6 +218,9 @@ static int host1x_probe(struct platform_device *pdev) return err; } + if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL)) + goto skip_iommu; + host->group = iommu_group_get(&pdev->dev); if (host->group) { struct iommu_domain_geometry *geometry; |