drm/i915: reorder edp disabling to fix ivb MacBook Air

[karo-tx-linux.git] / drivers / iommu / exynos-iommu.c

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 9a114b9ff1704f60278a5c94dd6b55a411adfa4d..45350ff5e93c9cbe58c1f73c49e932c5f57eb376 100644 (file)
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype,
        if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT))
                itype = SYSMMU_FAULT_UNKNOWN;
 
-       pr_err("%s occured at 0x%lx(Page table base: 0x%lx)\n",
+       pr_err("%s occurred at 0x%lx(Page table base: 0x%lx)\n",
                        sysmmu_fault_name[itype], fault_addr, pgtable_base);
 
        ent = section_entry(__va(pgtable_base), fault_addr);
@@ -732,6 +732,10 @@ static int exynos_iommu_domain_init(struct iommu_domain *domain)
        spin_lock_init(&priv->pgtablelock);
        INIT_LIST_HEAD(&priv->clients);
 
+       dom->geometry.aperture_start = 0;
+       dom->geometry.aperture_end   = ~0UL;
+       dom->geometry.force_aperture = true;
+
        domain->priv = priv;
        return 0;