Merge "ARM: dts: msm: Add secure display ion heap for GVMs" (fe7175bf) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sa6155p-vm.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,12 @@
		reg = <0x0 0xa1600000 0x0 0x20000000>;
		label = "pmem_shared_mem";
		};

		secure_display_memory: secure_display_region {
		compatible = "shared-dma-pool";
		reusable;
		reg = <0x0 0xc1800000 0x0 0x14000000>;
		};
		};
		};

		@@ -762,3 +768,11 @@
		dirconn-list = <100 216 1>,
		<99 215 1>;
		};

		&msm_ion {
		qcom,ion-heap@10 {
		reg = <10>;
		memory-region = <&secure_display_memory>;
		qcom,ion-heap-type = "HYP_CMA";
		};
		};

+14 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,12 @@
		reg = <0x0 0xa0000000 0x0 0x20000000>;
		label = "pmem_shared_mem";
		};

		secure_display_memory: secure_display_region {
		compatible = "shared-dma-pool";
		reusable;
		reg = <0x0 0xc0000000 0x0 0x14400000>;
		};
		};

		};
		@@ -52,3 +58,11 @@
		&sdhc_2 {
		status = "ok";
		};

		&msm_ion {
		qcom,ion-heap@10 {
		reg = <10>;
		memory-region = <&secure_display_memory>;
		qcom,ion-heap-type = "HYP_CMA";
		};
		};