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

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

Merge "msm: kgsl: Avoid calling get_secure_bus for iommu_domain_alloc for 8996"

parents 9553ae8d fecfa940

arch/arm/boot/dts/qcom/msm8996-gpu.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -191,8 +191,7 @@ 
		iommu_kgsl_cb2: iommu_kgsl_cb2 {

			compatible = "qcom,smmu-kgsl-cb";

			label = "gfx3d_user";

			iommus = <&kgsl_smmu 0>,

				 <&kgsl_smmu 1>;

			iommus = <&kgsl_smmu 0>;

		};



		iommu_kgsl_cb3: iommu_kgsl_cb3 {

drivers/gpu/msm/kgsl_iommu.c

+5 −3
Original line number Diff line number Diff line
@@ -540,10 +540,12 @@ static int kgsl_iommu_init_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt) 
		if (!mmu->secured)

			return -EPERM;



		if (!MMU_FEATURE(mmu, KGSL_MMU_HYP_SECURE_ALLOC)) {

			bus = get_secure_bus();

			if (bus == NULL)

				return -EPERM;

		}

	}



	iommu_pt = kzalloc(sizeof(struct kgsl_iommu_pt), GFP_KERNEL);

	if (!iommu_pt)