Merge "msm: mdss: Remove obsolete IOMMU domain attribute" into msm-4.8 (937ce277) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/sde/rotator/sde_rotator_smmu.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -511,7 +511,6 @@ int sde_smmu_probe(struct platform_device *pdev)
		struct sde_smmu_domain smmu_domain;
		const struct of_device_id *match;
		struct sde_module_power *mp;
		int disable_htw = 1;
		char name[MAX_CLIENT_NAME_LEN];

		if (!mdata) {
		@@ -600,13 +599,6 @@ int sde_smmu_probe(struct platform_device *pdev)
		goto disable_power;
		}

		rc = iommu_domain_set_attr(sde_smmu->mmu_mapping->domain,
		DOMAIN_ATTR_COHERENT_HTW_DISABLE, &disable_htw);
		if (rc) {
		SDEROT_ERR("couldn't disable coherent HTW\n");
		goto release_mapping;
		}

		if (smmu_domain.domain == SDE_IOMMU_DOMAIN_ROT_SECURE) {
		int secure_vmid = VMID_CP_PIXEL;