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

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

Merge changes I082d3382,I3af9e4d5 into msm-4.14 

* changes:
  ARM: dts: msm: Use SMR mask for KGSL SMMU for sdm855
  ARM: dts: msm: Introduce smr masks for kgsl smmu for sdm855
parents 53ed55bf 7626856b

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm855.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		reg = <0x02CA0000 0x10000>,

			<0x2CC2000 0x20>;

		reg-names = "base", "tcu-base";

		#iommu-cells = <1>;

		#iommu-cells = <2>;

		qcom,skip-init;

		qcom,use-3-lvl-tables;

		qcom,no-asid-retention;
@@ -366,7 +366,7 @@ 
		 * the SMMU driver. Our test uses ATOS, which doesn't use SIDs

		 * anyways, so using a dummy value is ok.

		 */

		iommus = <&kgsl_smmu 0x7>;

		iommus = <&kgsl_smmu 0x7 0>;

	};



	apps_iommu_test_device {

arch/arm64/boot/dts/qcom/sdm855-gpu.dtsi

+4 −5
Original line number Diff line number Diff line
@@ -293,15 +293,14 @@ 
		gfx3d_user: gfx3d_user {

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

			label = "gfx3d_user";

			iommus = <&kgsl_smmu 0x0>, <&kgsl_smmu 0x400>;

			iommus = <&kgsl_smmu 0x0 0x400>;

			qcom,gpu-offset = <0x48000>;

		};



		gfx3d_secure: gfx3d_secure {

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

			label = "gfx3d_secure";

			iommus = <&kgsl_smmu 0x2>, <&kgsl_smmu 0x1>,

					<&kgsl_smmu 0x402>, <&kgsl_smmu 0x401>;

			iommus = <&kgsl_smmu 0x2 0x400>, <&kgsl_smmu 0x1 0x400>;

		};

	};
@@ -377,12 +376,12 @@ 


		gmu_user: gmu_user {

			compatible = "qcom,smmu-gmu-user-cb";

			iommus = <&kgsl_smmu 0x4>, <&kgsl_smmu 0x404>;

			iommus = <&kgsl_smmu 0x4 0x400>;

		};



		gmu_kernel: gmu_kernel {

			compatible = "qcom,smmu-gmu-kernel-cb";

			iommus = <&kgsl_smmu 0x5>, <&kgsl_smmu 0x405>;

			iommus = <&kgsl_smmu 0x5 0x400>;

		};

	};

};