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

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

Merge "ARM: dts: msm: Add secure display heap configuration for ATOLL"

parents d8d36122 d792ad38

arch/arm64/boot/dts/qcom/atoll-ion.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -31,5 +31,11 @@ 
			reg = <9>;

			qcom,ion-heap-type = "SYSTEM_SECURE";

		};



		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

			reg = <10>;

			memory-region = <&secure_display_memory>;

			qcom,ion-heap-type = "HYP_CMA";

		};

	};

};

arch/arm64/boot/dts/qcom/atoll.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -574,6 +574,15 @@ 
			no-map;

			reg = <0 0x9f400000 0 0xc00000>;

		};



		secure_display_memory: secure_display_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>;

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x8c00000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";