Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59fedb7a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: add property to select rotator smmu mapping based on hw...

Merge "msm: sde: add property to select rotator smmu mapping based on hw version" into dev/msm-4.14-display
parents 897922f5 10f5c604
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -527,6 +527,7 @@ int sde_smmu_probe(struct platform_device *pdev)
	char name[MAX_CLIENT_NAME_LEN];
	char name[MAX_CLIENT_NAME_LEN];
	int mdphtw_llc_enable = 1;
	int mdphtw_llc_enable = 1;
	u32 sid = 0;
	u32 sid = 0;
	bool smmu_rot_full_map;


	if (!mdata) {
	if (!mdata) {
		SDEROT_INFO(
		SDEROT_INFO(
@@ -611,6 +612,13 @@ int sde_smmu_probe(struct platform_device *pdev)
		goto bus_client_destroy;
		goto bus_client_destroy;
	}
	}


	smmu_rot_full_map = of_property_read_bool(dev->of_node,
					 "qcom,fullsize-va-map");
	if (smmu_rot_full_map) {
		smmu_domain.start = SZ_128K;
		smmu_domain.size = SZ_4G - SZ_128K;
	}

	sde_smmu->mmu_mapping = arm_iommu_create_mapping(
	sde_smmu->mmu_mapping = arm_iommu_create_mapping(
		&platform_bus_type, smmu_domain.start, smmu_domain.size);
		&platform_bus_type, smmu_domain.start, smmu_domain.size);
	if (IS_ERR(sde_smmu->mmu_mapping)) {
	if (IS_ERR(sde_smmu->mmu_mapping)) {