From 8e20c29ff5e6254877ababaca091d26b017bf550 Mon Sep 17 00:00:00 2001 From: Hiroshi DOYU Date: Thu, 26 Jan 2012 19:40:57 +0100 Subject: [PATCH] --- yaml --- r: 316599 b: refs/heads/master c: 23349902edec4d3d932bca1bb99261477139a36a h: refs/heads/master i: 316597: ccfc2a82cad23ba4ba0250235b89efc05b1d7a96 316595: ebb446715873b5b65c0b88053dad94264b253352 316591: 10b6cf855a1ff3b1a4d355f86ecf7c1d6fe3ed70 v: v3 --- [refs] | 2 +- trunk/drivers/iommu/tegra-gart.c | 5 +++++ trunk/drivers/iommu/tegra-smmu.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ba203c51f0d9..ee1cd1c29a38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4be6a290b87af9136b482d5c22574f070ffdbdb8 +refs/heads/master: 23349902edec4d3d932bca1bb99261477139a36a diff --git a/trunk/drivers/iommu/tegra-gart.c b/trunk/drivers/iommu/tegra-gart.c index 0c0a37792218..c16e8fc8a4bd 100644 --- a/trunk/drivers/iommu/tegra-gart.c +++ b/trunk/drivers/iommu/tegra-gart.c @@ -165,6 +165,11 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain, return -EINVAL; domain->priv = gart; + domain->geometry.aperture_start = gart->iovmm_base; + domain->geometry.aperture_end = gart->iovmm_base + + gart->page_count * GART_PAGE_SIZE - 1; + domain->geometry.force_aperture = true; + client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL); if (!client) return -ENOMEM; diff --git a/trunk/drivers/iommu/tegra-smmu.c b/trunk/drivers/iommu/tegra-smmu.c index ecd679043d77..96e73d56451a 100644 --- a/trunk/drivers/iommu/tegra-smmu.c +++ b/trunk/drivers/iommu/tegra-smmu.c @@ -807,6 +807,11 @@ static int smmu_iommu_domain_init(struct iommu_domain *domain) spin_unlock_irqrestore(&as->lock, flags); domain->priv = as; + domain->geometry.aperture_start = smmu->iovmm_base; + domain->geometry.aperture_end = smmu->iovmm_base + + smmu->page_count * SMMU_PAGE_SIZE - 1; + domain->geometry.force_aperture = true; + dev_dbg(smmu->dev, "smmu_as@%p\n", as); return 0;