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

Commit f83fcdfd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: set non fatal atttribute for SDE iommus"

parents 7294e6b3 55732bf9

arch/arm64/boot/dts/qcom/kona-sde.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ 
			compatible = "qcom,smmu_sde_unsec";

			iommus = <&apps_smmu 0x820 0x402>;

			qcom,iommu-dma-addr-pool = <0x00020000 0xfffe0000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-earlymap; /* for cont-splash */

		};
@@ -275,6 +276,7 @@ 
			compatible = "qcom,smmu_sde_sec";

			iommus = <&apps_smmu 0x821 0x400>;

			qcom,iommu-dma-addr-pool = <0x00020000 0xfffe0000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-vmid = <0xa>;

		};

drivers/gpu/drm/msm/msm_smmu.c

+0 −3
Original line number Diff line number Diff line
@@ -398,9 +398,6 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain, 
	DRM_ERROR("trigger dump, iova=0x%08lx, flags=0x%x\n", iova, flags);

	DRM_ERROR("SMMU device:%s", client->dev ? client->dev->kobj.name : "");



	/* generate dump, but no panic */

	SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus");



	/*

	 * return -ENOSYS to allow smmu driver to dump out useful

	 * debug info.