Commit 24cfdc1a authored by Thierry Reding's avatar Thierry Reding

drm/tegra: Acquire a reference to the IOVA cache

The IOVA API uses a memory cache to allocate IOVA nodes from. To make
sure that this cache is available, obtain a reference to it and release
the reference when the cache is no longer needed.

On 64-bit ARM this is hidden by the fact that the DMA mapping API gets
that reference and never releases it. On 32-bit ARM, however, the DMA
mapping API doesn't do that, so allocation of IOVA nodes fails.

Fixes: ad926015 ("drm/tegra: Add Tegra DRM allocation API")
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Tested-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 5f43ac8d
...@@ -113,6 +113,10 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) ...@@ -113,6 +113,10 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
goto free; goto free;
} }
err = iova_cache_get();
if (err < 0)
goto domain;
geometry = &tegra->domain->geometry; geometry = &tegra->domain->geometry;
gem_start = geometry->aperture_start; gem_start = geometry->aperture_start;
gem_end = geometry->aperture_end - CARVEOUT_SZ; gem_end = geometry->aperture_end - CARVEOUT_SZ;
...@@ -207,8 +211,11 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) ...@@ -207,8 +211,11 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
mutex_destroy(&tegra->mm_lock); mutex_destroy(&tegra->mm_lock);
drm_mm_takedown(&tegra->mm); drm_mm_takedown(&tegra->mm);
put_iova_domain(&tegra->carveout.domain); put_iova_domain(&tegra->carveout.domain);
iommu_domain_free(tegra->domain); iova_cache_put();
} }
domain:
if (tegra->domain)
iommu_domain_free(tegra->domain);
free: free:
kfree(tegra); kfree(tegra);
return err; return err;
...@@ -233,6 +240,7 @@ static void tegra_drm_unload(struct drm_device *drm) ...@@ -233,6 +240,7 @@ static void tegra_drm_unload(struct drm_device *drm)
mutex_destroy(&tegra->mm_lock); mutex_destroy(&tegra->mm_lock);
drm_mm_takedown(&tegra->mm); drm_mm_takedown(&tegra->mm);
put_iova_domain(&tegra->carveout.domain); put_iova_domain(&tegra->carveout.domain);
iova_cache_put();
iommu_domain_free(tegra->domain); iommu_domain_free(tegra->domain);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment