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

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

Merge "msm: vidc: Add support for decoder downscaling"

parents 3ec068d5 73aab53e

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

+14 −14
Original line number Original line Diff line number Diff line
@@ -49,16 +49,16 @@ Optional properties: 
        - Buffer types are defined as the following:

        - Buffer types are defined as the following:

          input = 0x1

          input = 0x1

          output = 0x2

          output = 0x2

          output2 = 0x2

          output2 = 0x4

          extradata input = 0x4

          extradata input = 0x8

          extradata output = 0x8

          extradata output = 0x10

          extradata output2 = 0x8

          extradata output2 = 0x20

          internal scratch = 0x10

          internal scratch = 0x40

          internal scratch1 = 0x20

          internal scratch1 = 0x80

          internal scratch2 = 0x40

          internal scratch2 = 0x100

          internal persist = 0x80

          internal persist = 0x200

          internal persist1 = 0x100

          internal persist1 = 0x400

          internal cmd queue = 0x200

          internal cmd queue = 0x800

- *-supply: A phandle pointing to the appropriate regulator. Number of

- *-supply: A phandle pointing to the appropriate regulator. Number of

  regulators vary across targets.

  regulators vary across targets.

- qcom,clock-names: an array of clocks that the driver is supposed to be

- qcom,clock-names: an array of clocks that the driver is supposed to be
@@ -110,14 +110,14 @@ Example: 
		qcom,vidc-iommu-domains {

		qcom,vidc-iommu-domains {

			qcom,domain-ns {

			qcom,domain-ns {

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-partition-buffer-types = <0x1ff>,

				qcom,vidc-partition-buffer-types = <0x7ff>,

							<0x200>;

							<0x800>;

			};

			};





			qcom,domain-cp {

			qcom,domain-cp {

				qcom,vidc-domain-phandle = <&venus_domain_cp>;

				qcom,vidc-domain-phandle = <&venus_domain_cp>;

				qcom,vidc-partition-buffer-types = <0x2>,

				qcom,vidc-partition-buffer-types = <0x6>,

							<0x1f1>;

							<0x7c1>;

			};

			};

		};

		};

arch/arm/boot/dts/apq8084.dtsi

+5 −5
Original line number Original line Diff line number Diff line
@@ -2047,20 +2047,20 @@ 
		qcom,vidc-iommu-domains {

		qcom,vidc-iommu-domains {

			qcom,domain-ns {

			qcom,domain-ns {

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-partition-buffer-types = <0x1ff>,

				qcom,vidc-partition-buffer-types = <0x7ff>,

					<0x200>;

					<0x800>;

			};

			};

			qcom,domain-sec-bs {

			qcom,domain-sec-bs {

				qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

				qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

				qcom,vidc-partition-buffer-types = <0x91>;

				qcom,vidc-partition-buffer-types = <0x241>;

			};

			};

			qcom,domain-sec-px {

			qcom,domain-sec-px {

				qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

				qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

				qcom,vidc-partition-buffer-types = <0x42>;

				qcom,vidc-partition-buffer-types = <0x106>;

			};

			};

			qcom,domain-sec-np {

			qcom,domain-sec-np {

				qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

				qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

				qcom,vidc-partition-buffer-types = <0x120>;

				qcom,vidc-partition-buffer-types = <0x480>;

			};

			};

		};

		};

	};

	};

arch/arm/boot/dts/msm8226.dtsi

+4 −4
Original line number Original line Diff line number Diff line
@@ -202,14 +202,14 @@ 
		qcom,vidc-iommu-domains {

		qcom,vidc-iommu-domains {

			qcom,domain-ns {

			qcom,domain-ns {

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

				qcom,vidc-partition-buffer-types = <0x1ff>,

				qcom,vidc-partition-buffer-types = <0x7ff>,

							<0x200>;

							<0x800>;

			};

			};





			qcom,domain-cp {

			qcom,domain-cp {

				qcom,vidc-domain-phandle = <&venus_domain_cp>;

				qcom,vidc-domain-phandle = <&venus_domain_cp>;

				qcom,vidc-partition-buffer-types = <0x2>,

				qcom,vidc-partition-buffer-types = <0x6>,

							<0x1f1>;

							<0x7c1>;

			};

			};

		};

		};

	};

	};

arch/arm/boot/dts/msm8974-v2.dtsi

+18 −18
Original line number Original line Diff line number Diff line
@@ -143,20 +143,20 @@ 
	qcom,vidc-iommu-domains {

	qcom,vidc-iommu-domains {

		qcom,domain-ns {

		qcom,domain-ns {

			qcom,vidc-domain-phandle = <&venus_domain_ns>;

			qcom,vidc-domain-phandle = <&venus_domain_ns>;

                        qcom,vidc-partition-buffer-types = <0x1ff>,

			qcom,vidc-partition-buffer-types = <0x7ff>,

							<0x200>;

				<0x800>;

		};

		};

		qcom,domain-sec-bs {

		qcom,domain-sec-bs {

			qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

                        qcom,vidc-partition-buffer-types = <0x91>;

			qcom,vidc-partition-buffer-types = <0x241>;

		};

		};

		qcom,domain-sec-px {

		qcom,domain-sec-px {

			qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

                        qcom,vidc-partition-buffer-types = <0x42>;

			qcom,vidc-partition-buffer-types = <0x106>;

		};

		};

		qcom,domain-sec-np {

		qcom,domain-sec-np {

			qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

                        qcom,vidc-partition-buffer-types = <0x120>;

			qcom,vidc-partition-buffer-types = <0x480>;

		};

		};

	};

	};

arch/arm/boot/dts/msm8974pro.dtsi

+5 −5
Original line number Original line Diff line number Diff line
@@ -1685,20 +1685,20 @@ 
	qcom,vidc-iommu-domains {

	qcom,vidc-iommu-domains {

		qcom,domain-ns {

		qcom,domain-ns {

			qcom,vidc-domain-phandle = <&venus_domain_ns>;

			qcom,vidc-domain-phandle = <&venus_domain_ns>;

			qcom,vidc-partition-buffer-types = <0x1ff>,

			qcom,vidc-partition-buffer-types = <0x7ff>,

							<0x200>;

							<0x800>;

		};

		};

		qcom,domain-sec-bs {

		qcom,domain-sec-bs {

			qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_bitstream>;

			qcom,vidc-partition-buffer-types = <0x91>;

			qcom,vidc-partition-buffer-types = <0x241>;

		};

		};

		qcom,domain-sec-px {

		qcom,domain-sec-px {

			qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_pixel>;

			qcom,vidc-partition-buffer-types = <0x42>;

			qcom,vidc-partition-buffer-types = <0x106>;

		};

		};

		qcom,domain-sec-np {

		qcom,domain-sec-np {

			qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

			qcom,vidc-domain-phandle = <&venus_domain_sec_non_pixel>;

			qcom,vidc-partition-buffer-types = <0x120>;

			qcom,vidc-partition-buffer-types = <0x480>;

		};

		};

	};

	};

};

};