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

Commit c3656761 authored by Srinu Gorle's avatar Srinu Gorle
Browse files

msm: vidc: scale clocks based on codecs supported and load 



Add codecs supported entry for each load in load frequency vector.
This will facilitate to identify venus clock frequencies for each
codec sessions & codecs.
For same amount of load (number of macro blocks per second), required clock
frequency may vary depending on codec and session type.
Read codecs supported entry for each load in load frequency table,
scale clocks appropriately based on codecs supported and load.

For example: H.263 VGA 30fps decoding requires 133 Mhz and HEVC VGA 30fps
decoding requires 200 Mhz.

Change-Id: I23eddbb791c65e7b290988e482c6acb816aa083d
Signed-off-by: default avatarSrinu Gorle <sgorle@codeaurora.org>
parent 5b5abd71

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

+9 −7
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ Optional properties: 
- reg : offset and length of the register set for the device.

- interrupts : should contain the vidc interrupt.

- qcom,load-freq-tbl : load (in macroblocks/sec) and corresponding vcodec

  clock required for optimal performance in descending order.

  clock required along with codec's config (same as qcom,bus-configs mentioned below)

  for optimal performance in descending order.

- qcom,reg-presets : list of offset-value pairs for registers to be written.

  The offsets are from the base offset specified in 'reg'. This is mainly

  used for QoS, VBIF, etc. presets for video.
@@ -115,12 +116,13 @@ Example: 
		venus-supply = <&gdsc>;

		venus-core0-supply = <&gdsc1>;

		venus-core1-supply = <&gdsc2>;

		qcom,load-freq-tbl = <979200 410000000>,

				<560145 266670000>,

				<421161 200000000>,

				<243000 133330000>,

				<108000 100000000>,

				<36000 50000000>;

		qcom,load-freq-tbl =

			<489600 266670000 0x030fcfff>, /* Legacy decoder 1080p 60fps  */

			<108000 133330000 0x030fcfff>, /* Legacy decoder 720p 30fps   */

			<108000 200000000 0x01000414>, /* Legacy encoder 720p 30fps   */

			<72000 133330000 0x0c000000>, /* HEVC decoder VGA 60fps   */

			<36000 133330000 0x0c000000>, /* HEVC VGA 30 fps  */

			<36000 133330000 0x01000414>; /* Legacy encoder VGA 30 fps   */

		qcom,ocmem-size = <4096>;

		qcom,hfi = "venus";

		qcom,reg-presets = <0x80004 0x1>,

arch/arm/boot/dts/qcom/apq8084.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -4904,10 +4904,10 @@ 
		qcom,clock-names= "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk", "mem_clk";

		qcom,clock-configs = <0x3 0x0 0x0 0x0 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <979200 465000000>,

			<783360 465000000>,

			<489600 266670000>,

			<244800 133330000>;

		qcom,load-freq-tbl = <979200 465000000 0xffffffff>,

			<783360 465000000 0xffffffff>,

			<489600 266670000 0xffffffff>,

			<244800 133330000 0xffffffff>;

		qcom,reg-presets = <0x800B0 0x00101001>,

			<0x800B0 0x00101001>,

			<0x800B4 0x00101010>,

arch/arm/boot/dts/qcom/msm8226.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ 
		qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x3 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <352800 160000000>,

			<244800 133330000>,

			<108000  66700000>;

		qcom,load-freq-tbl = <352800 160000000 0xffffffff>,

			<244800 133330000 0xffffffff>,

			<108000  66700000 0xffffffff>;

		qcom,hfi = "venus";

		qcom,reg-presets = <0xE0024 0x0>,

			<0x80124 0x3>,

arch/arm/boot/dts/qcom/msm8916.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1606,9 +1606,9 @@ 
		qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x1 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <352800 228570000>,

			<244800 160000000>,

			<108000 100000000>;

		qcom,load-freq-tbl = <352800 228570000 0xffffffff>,

			<244800 160000000 0xffffffff>,

			<108000 100000000 0xffffffff>;

		qcom,hfi = "venus";

		qcom,reg-presets = <0xE0020 0x0aaaaaaa>,

			<0xE0024 0x0aaaaaaa>,

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+35 −14
Original line number Diff line number Diff line
@@ -1382,9 +1382,24 @@ 
		qcom,clock-names = "core_clk", "core0_clk", "core1_clk", "iface_clk", "bus_clk";

		qcom,clock-configs = <0x1 0x0 0x0 0x0 0x0>;

		qcom,sw-power-collapse;

		qcom,load-freq-tbl = <352800 266670000>,

			<244800 200000000>,

			<108000 133330000>;

		qcom,load-freq-tbl =

			<489600 266670000 0x0c000000>, /* HEVC  decoder 1080p 60fps  */

			<489600 266670000 0x030fcfff>, /* Legacy decoder 1080p 60fps  */

			<489600 266670000 0x01000414>, /* Encoder turbo (wfd) */

			<244800 133330000 0x0c000000>, /* HEVC decoder 1080p 30fps   */

			<244800 133330000 0x030fcfff>, /* Legacy decoder 1080p 30fps   */

			<244800 200000000 0x01000414>, /* Legacy encoder 1080p 30fps   */

			<220800 133330000 0x0c000000>, /* HEVC  decoder 720p 60fps  */

			<220800 133330000 0x030fcfff>, /* Legacy decoder 720p 60fps  */

			<108000 133330000 0x0c000000>, /* HEVC decoder 720p 30fps   */

			<108000 133330000 0x030fcfff>, /* Legacy decoder 720p 30fps   */

			<108000 200000000 0x01000414>, /* Legacy encoder 720p 30fps   */

			<72000 133330000 0x0c000000>, /* HEVC decoder VGA 60fps   */

			<72000 133330000 0x030fcfff>, /* Legacy decoder VGA 60fps   */

			<36000 133330000 0x0c000000>, /* HEVC VGA 30 fps  */

			<36000 133330000 0x030fcfff> ,/* Legacy decoder VGA 30 fps  */

			<36000 133330000 0x01000414>; /* Legacy encoder VGA 30 fps   */



		qcom,hfi = "venus";

		qcom,reg-presets = <0xE0020 0x0aaaaaaa>,

			<0xE0024 0x0aaaaaaa>,
@@ -1420,31 +1435,37 @@ 
				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 133600 674400>,

					<63 512 400900 1079000>,

					<63 512 908600 1537600>;

					<63 512 136806 1236684>,

					<63 512 410521 1859686>,

					<63 512 930406 1859686>;

				qcom,bus-configs = <0x01000414>;

			};

			qcom,msm-bus-client@1 {

				qcom,msm-bus,name = "vdec-core0-ddr";

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <7>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 99600 831900>,

					<63 512 298900 831900>,

					<63 512 677600 1331000>;

					<63 512 101991 644403>,

					<63 512 204083 1288704>,

					<63 512 306074 644403>,

					<63 512 612250 1288704>,

					<63 512 693863 644403>,

					<63 512 1387725 2577408>;

				qcom,bus-configs = <0x030fcfff>;

			};

			qcom,msm-bus-client@2 {

				qcom,msm-bus,name = "vdec-core1-ddr";

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <7>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 99600 831900>,

					<63 512 298900 831900>,

					<63 512 677600 1331000>;

					<63 512 96051 572826>,

					<63 512 192103 1145754>,

					<63 512 288256 572826>,

					<63 512 576410 1145754>,

					<63 512 653312 572826>,

					<63 512 1306624 2291405>;

				qcom,bus-configs = <0x0c000000>;

			};

		};