Merge tag 'drm/tegra/for-4.2-rc1' of git://anongit.freedesktop.org/tegra/linux into...

[karo-tx-linux.git] / drivers / gpu / drm / tegra / drm.c

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index bfad15a913a023b0f0f3272118fe822fc9097d0c..427f50c6803cba7d3ed5424547ac7c812d6bb536 100644 (file)
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -124,14 +124,22 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
                return -ENOMEM;
 
        if (iommu_present(&platform_bus_type)) {
+               struct iommu_domain_geometry *geometry;
+               u64 start, end;
+
                tegra->domain = iommu_domain_alloc(&platform_bus_type);
                if (!tegra->domain) {
                        err = -ENOMEM;
                        goto free;
                }
 
-               DRM_DEBUG("IOMMU context initialized\n");
-               drm_mm_init(&tegra->mm, 0, SZ_2G);
+               geometry = &tegra->domain->geometry;
+               start = geometry->aperture_start;
+               end = geometry->aperture_end;
+
+               DRM_DEBUG("IOMMU context initialized (aperture: %#llx-%#llx)\n",
+                         start, end);
+               drm_mm_init(&tegra->mm, start, end - start + 1);
        }
 
        mutex_init(&tegra->clients_lock);