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

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

Merge "msm: vidc_3x: Add CMA support for video hardware"

parents 242531a3 6828ecc3

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ Optional properties: 
          internal persist1 = 0x400

          internal cmd queue = 0x800

- virtual-addr-pool : offset and length of virtual address pool.

- cma-addr-pool : offset and length of CMA address pool.

- qcom,cma-s1-bypass : bool indicating stage 1 translation bypass need for CMA region.

- qcom,fw-context-bank : bool indicating firmware context bank.

- qcom,secure-context-bank : bool indicating secure context bank.
@@ -180,6 +182,8 @@ Example: 
				<&venus_smmu 0x0c>;

			buffer-types = <0xfff>;

			virtual-addr-pool = <0x5dc00000 0x80000000>;

			cma-addr-pool= <0xb6800000 0x9800000>;

			qcom,cma-s1-bypass;

			qcom,secure-context-bank;

		};

arch/arm64/boot/dts/qcom/sdm660-vidc.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
				<&mmss_bimc_smmu 0x431>;

			buffer-types = <0xfff>;

			virtual-addr-pool = <0x79000000 0x60000000>;

			cma-addr-pool = <0xD0000000 0x9000000>;

		};



		secure_bitstream_cb {
@@ -226,6 +227,7 @@ 
				<&mmss_bimc_smmu 0x52b>;

			buffer-types = <0x241>;

			virtual-addr-pool = <0x51000000 0x28000000>;

			cma-addr-pool = <0xC0000000 0x10000000>;

			qcom,secure-context-bank;

		};
@@ -238,6 +240,8 @@ 
				<&mmss_bimc_smmu 0x52c>;

			buffer-types = <0x106>;

			virtual-addr-pool = <0x29000000 0x28000000>;

			cma-addr-pool= <0xb6800000 0x9800000>;

			qcom,cma-s1-bypass;

			qcom,secure-context-bank;

		};
@@ -255,6 +259,7 @@ 
				<&mmss_bimc_smmu 0x540>;

			buffer-types = <0x480>;

			virtual-addr-pool = <0x1000000 0x28000000>;

			cma-addr-pool= <0x1000000 0x28000000>;

			qcom,secure-context-bank;

		};

	};