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

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

Merge "ARM: dts: msm: add sde rsc node for kona target"

parents 14b40d78 f92536a5

Documentation/devicetree/bindings/display/msm/sde-rsc.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Snapdragon Display Engine implements display rsc to driver 
display core to different modes for power saving



Required properties

- compatible:			Must be "qcom,sde-rsc"

- compatible:			"qcom,sde-rsc"

				"qcom,sde-rsc-rpmh"

- reg:				Offset and length of the register set for

				the device.

- reg-names:			Names to refer to register sets related

arch/arm64/boot/dts/qcom/kona-sde.dtsi

+46 −0
Original line number Diff line number Diff line
@@ -251,4 +251,50 @@ 
				<1 590 0 300000>;

		};

	};



	sde_rscc: qcom,sde_rscc@af20000 {

		cell-index = <0>;

		compatible = "qcom,sde-rsc";

		reg = <0xaf20000 0x3c50>,

			<0xaf30000 0x3fd4>;

		reg-names = "drv", "wrapper";

		qcom,sde-rsc-version = <3>;

		status = "disabled";



		qcom,sde-dram-channels = <2>;



		/* data and reg bus scale settings */

		qcom,sde-data-bus {

			qcom,msm-bus,name = "disp_rsc_mnoc";

			qcom,msm-bus,active-only;

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

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

			qcom,msm-bus,vectors-KBps =

			    <20003 20515 0 0>, <20004 20515 0 0>,

			    <20003 20515 0 6400000>, <20004 20515 0 6400000>,

			    <20003 20515 0 6400000>, <20004 20515 0 6400000>;

		};



		qcom,sde-llcc-bus {

			qcom,msm-bus,name = "disp_rsc_llcc";

			qcom,msm-bus,active-only;

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

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

			qcom,msm-bus,vectors-KBps =

			    <20001 20513 0 0>,

			    <20001 20513 0 6400000>,

			    <20001 20513 0 6400000>;

		};



		qcom,sde-ebi-bus {

			qcom,msm-bus,name = "disp_rsc_ebi";

			qcom,msm-bus,active-only;

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

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

			qcom,msm-bus,vectors-KBps =

			    <20000 20512 0 0>,

			    <20000 20512 0 6400000>,

			    <20000 20512 0 6400000>;

		};

	};

};

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

+6 −0
Original line number Diff line number Diff line
@@ -1246,6 +1246,12 @@ 
				  <WAKE_TCS    1>,

				  <CONTROL_TCS 0>;

		status = "disabled";



		sde_rsc_rpmh {

			compatible = "qcom,sde-rsc-rpmh";

			cell-index = <0>;

			status = "disabled";

		};

	};



	tcsr_mutex_block: syscon@1f40000 {

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ msm_drm-$(CONFIG_DRM_MSM_MDP5) += disp/mdp_format.o \ 


msm_drm-$(CONFIG_DRM_SDE_RSC) += sde_rsc.o \

	sde_rsc_hw.o \

	sde_rsc_hw_v3.o \



# use drm gpu driver only if qcom_kgsl driver not available

ifneq ($(CONFIG_QCOM_KGSL),y)

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+2 −1
Original line number Diff line number Diff line
@@ -1803,7 +1803,8 @@ static int dsi_panel_parse_jitter_config( 
				  &priv_info->panel_prefill_lines);

	if (rc) {

		pr_debug("panel prefill lines are not defined rc=%d\n", rc);

		priv_info->panel_prefill_lines = DEFAULT_PANEL_PREFILL_LINES;

		priv_info->panel_prefill_lines = mode->timing.v_back_porch +

			mode->timing.v_sync_width + mode->timing.v_front_porch;

	} else if (priv_info->panel_prefill_lines >=

					DSI_V_TOTAL(&mode->timing)) {

		pr_debug("invalid prefill lines config=%d setting to:%d\n",