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

Commit 431c1590 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: Change governor names to be less than 15 chars"

parents 158e7e80 8c44c527

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

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ Required properties: 
Optional properties:

- qcom,bus-governor : governor to use when scaling bus, generally any commonly

  found devfreq governor might be used.  In addition to those governors, the

  custom Venus govenors, "msm-vidc-bw-ddr" or "msm-vidc-bw-vmem" are also

  custom Venus governors, "msm-vidc-ddr" or "msm-vidc-vmem" are also

  acceptable values.

  In the absence of this property the "performance" governor is used.

- qcom,bus-rage-kbps : an array of two items (<min max>) that indicate the
@@ -204,7 +204,7 @@ Example: 
			label = "venus-ddr";

			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;

			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;

			qcom,bus-governor = "msm-vidc-bw-ddr";

			qcom,bus-governor = "msm-vidc-ddr";

			qcom,bus-range-kbps = <1000 3388000>;

		};

	};

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

+2 −2
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ 
			label = "venus-ddr";

			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;

			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;

			qcom,bus-governor = "msm-vidc-bw-ddr";

			qcom,bus-governor = "msm-vidc-ddr";

			qcom,bus-range-kbps = <1000 3388000>;

		};
@@ -426,7 +426,7 @@ 
			label = "venus-vmem";

			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0_OCMEM>; /* legacy OCMEM == VMEM */

			qcom,bus-slave = <MSM_BUS_SLAVE_VMEM>;

			qcom,bus-governor = "msm-vidc-bw-vmem";

			qcom,bus-governor = "msm-vidc-vmem";

			qcom,bus-range-kbps = <1000 6776000>;

		};

drivers/media/platform/msm/vidc/governors/msm_vidc_bw_gov.c

+2 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static struct governor governors[] = { 
	{

		.mode = GOVERNOR_DDR,

		.devfreq_gov = {

			.name = "msm-vidc-bw-ddr",

			.name = "msm-vidc-ddr",

			.get_target_freq = __get_target_freq,

			.event_handler = __event_handler,

		},
@@ -1018,7 +1018,7 @@ static struct governor governors[] = { 
	{

		.mode = GOVERNOR_VMEM,

		.devfreq_gov = {

			.name = "msm-vidc-bw-vmem",

			.name = "msm-vidc-vmem",

			.get_target_freq = __get_target_freq,

			.event_handler = __event_handler,

		},