diff options
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_smmu.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c index 077f7521a971..f0f66ac4b2fb 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c @@ -561,7 +561,7 @@ static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev) #ifdef CONFIG_OF /* TODO */ config.max_clk = 266667000; - config.iommu = iommu_domain_alloc(&platform_bus_type); + config.iommu = iommu_domain_alloc(msm_iommu_get_bus(&dev->dev)); #else if (cpu_is_apq8064()) config.max_clk = 266667000; diff --git a/drivers/video/fbdev/msm/mdss_smmu.c b/drivers/video/fbdev/msm/mdss_smmu.c index 8bb46fad7875..e129068a97e8 100644 --- a/drivers/video/fbdev/msm/mdss_smmu.c +++ b/drivers/video/fbdev/msm/mdss_smmu.c @@ -17,6 +17,7 @@ #include <linux/debugfs.h> #include <linux/kernel.h> #include <linux/iommu.h> +#include <linux/qcom_iommu.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/clk/msm-clk.h> @@ -583,7 +584,7 @@ int mdss_smmu_probe(struct platform_device *pdev) } mdss_smmu->mmu_mapping = arm_iommu_create_mapping( - &platform_bus_type, va_start, va_size); + msm_iommu_get_bus(dev), va_start, va_size); if (IS_ERR(mdss_smmu->mmu_mapping)) { pr_err("iommu create mapping failed for domain[%d]\n", domain); rc = PTR_ERR(mdss_smmu->mmu_mapping); |