diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-11 01:16:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-11 01:16:51 -0700 |
| commit | 90201c49642c8f600cbbe06381b75c139182bc09 (patch) | |
| tree | 56c0b52507142bdd5c70c35bed45df0a8b91170a | |
| parent | 2e928295ca70bf371f31d3117696274764eeeebb (diff) | |
| parent | 81e8b7fd63597069eb94f970ba176c3ded32b61c (diff) | |
Merge "msm: mdss: Remove obsolete IOMMU domain attribute"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_smmu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/fbdev/msm/mdss_smmu.c b/drivers/video/fbdev/msm/mdss_smmu.c index b5da4ad1a86b..eab7bcaaa156 100644 --- a/drivers/video/fbdev/msm/mdss_smmu.c +++ b/drivers/video/fbdev/msm/mdss_smmu.c @@ -573,7 +573,6 @@ int mdss_smmu_probe(struct platform_device *pdev) struct mdss_smmu_domain smmu_domain; const struct of_device_id *match; struct dss_module_power *mp; - int disable_htw = 1; char name[MAX_CLIENT_NAME_LEN]; const __be32 *address = NULL, *size = NULL; @@ -667,13 +666,6 @@ int mdss_smmu_probe(struct platform_device *pdev) goto disable_power; } - rc = iommu_domain_set_attr(mdss_smmu->mmu_mapping->domain, - DOMAIN_ATTR_COHERENT_HTW_DISABLE, &disable_htw); - if (rc) { - pr_err("couldn't disable coherent HTW\n"); - goto release_mapping; - } - if (smmu_domain.domain == MDSS_IOMMU_DOMAIN_SECURE || smmu_domain.domain == MDSS_IOMMU_DOMAIN_ROT_SECURE) { int secure_vmid = VMID_CP_PIXEL; |