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

Commit 0f212a38 authored by Namratha Siddappa's avatar Namratha Siddappa
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  clk: qcom: mdss: fix possible NULL pointer dereference
  drm/msm/dsi-staging: fix possible array index out of bound access
  drm/msm/sde: sanitize debugfs inputs when reading mdp memory
  drm/msm/dp: update CP2520 pattern for electrical compliance
  drm/msm/dp: fix race condition during simulation
  drm/msm/dp: fix hdcp version check at sink
  drm/msm/sde: update initial clock value for continuous splash
  drm/msm/sde: clean up splash resource on failure
  ARM: dts: msm: add hd sim command display panel for SM8150 target
  drm/msm: Fix uninitialization and out of bound access issues
  drm/msm/sde: Add refcount support for wb irq ctrl
  drm/msm/dp: do not validate streams for HDR
  drm/msm/sde: reset plane state if not used in first commit
  drm/msm/sde: fix dual_ctl identification in encoder
  drm/msm: add import flag when buffer is imported
  ARM: dts: msm: Add DT properties to enable DP on sm6150 target
  clk: qcom: mdss: add support for 14nm DP PLL for sm6150 target
  drm:msm: begin/end CPU access before dma_buf vmap/vunmap
  drm/msm/sde: update secure_level after sec to non-sec transition
  drm/msm/sde: Add support for ROI function of AD4
  clk: qcom: mdss: update PLL programming for DisplayPort on sm8150
  drm/msm/dsi-staging: add support for secondary dsi display
  drm/msm/sde: register DSC_CTL and MERGE_3D blocks for debug dump
  ARM: dts: msm: enable ulps feature on sharp 1080p
  drm/msm/sde: add sysfs node in dpu driver to provide fps
  drm/msm/sde: update kickoff_cnt before ESD status check
  drm/msm/dsi-staging: validate dsi command size before sending command.

Change-Id: I879c90dc3a90217ac90a63c925bc2965c0c45b71
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 71644d76 b0e5566f

Documentation/devicetree/bindings/fb/mdss-pll.txt

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ Required properties: 
                        "qcom,mdss_dsi_pll_10nm",  "qcom,mdss_dp_pll_8998",

                        "qcom,mdss_hdmi_pll_8998", "qcom,mdss_dp_pll_10nm",

                        "qcom,mdss_dsi_pll_7nm",   "qcom,mdss_dp_pll_7nm",

			"qcom,mdss_dsi_pll_28lpm", "qcom,mdss_dsi_pll_14nm"

			"qcom,mdss_dsi_pll_28lpm", "qcom,mdss_dsi_pll_14nm",

			"qcom,mdss_dp_pll_14nm"

- cell-index:		Specifies the controller used

- reg:			offset and length of the register set for the device.

- reg-names :		names to refer to register sets related to this device

arch/arm64/boot/dts/qcom/dsi-panel-sim-sec-hd-cmd.dtsi

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&mdss_mdp {

	dsi_sim_sec_hd_cmd: qcom,mdss_dsi_sim_sec_hd_cmd {

		qcom,mdss-dsi-panel-name =

				"sim hd command mode secondary dsi panel";

		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";

		qcom,mdss-dsi-virtual-channel-id = <0>;

		qcom,mdss-dsi-stream = <0>;

		qcom,mdss-dsi-bpp = <24>;

		qcom,mdss-dsi-underflow-color = <0xff>;

		qcom,mdss-dsi-border-color = <0>;

		qcom,mdss-dsi-traffic-mode = "burst_mode";

		qcom,panel-ack-disabled;

		qcom,mdss-dsi-te-using-wd;

		qcom,mdss-dsi-te-pin-select = <1>;

		qcom,mdss-dsi-te-dcs-command = <1>;

		qcom,mdss-dsi-te-check-enable;

		qcom,mdss-dsi-te-using-te-pin;

		qcom,mdss-dsi-bllp-eof-power-mode;

		qcom,mdss-dsi-bllp-power-mode;

		qcom,mdss-dsi-lane-0-state;

		qcom,mdss-dsi-lane-1-state;

		qcom,mdss-dsi-lane-2-state;

		qcom,mdss-dsi-lane-3-state;

		qcom,mdss-dsi-reset-sequence = <1 10>, <0 10>, <1 10>;

		qcom,mdss-dsi-tx-eot-append;

		qcom,mdss-dsi-post-init-delay = <1>;

		qcom,mdss-dsi-dma-trigger = "trigger_sw";

		qcom,mdss-dsi-mdp-trigger = "none";



		qcom,mdss-dsi-display-timings {

			timing@0{

				qcom,mdss-dsi-panel-width = <720>;

				qcom,mdss-dsi-panel-height = <1280>;

				qcom,mdss-dsi-h-front-porch = <120>;

				qcom,mdss-dsi-h-back-porch = <60>;

				qcom,mdss-dsi-h-pulse-width = <12>;

				qcom,mdss-dsi-h-sync-skew = <0>;

				qcom,mdss-dsi-v-back-porch = <2>;

				qcom,mdss-dsi-v-front-porch = <12>;

				qcom,mdss-dsi-v-pulse-width = <2>;

				qcom,mdss-dsi-h-sync-pulse = <0>;

				qcom,mdss-dsi-h-left-border = <0>;

				qcom,mdss-dsi-h-right-border = <0>;

				qcom,mdss-dsi-v-top-border = <0>;

				qcom,mdss-dsi-v-bottom-border = <0>;

				qcom,mdss-dsi-panel-framerate = <60>;



				qcom,mdss-dsi-on-command = [

					/* sleep out + delay 120ms */

					05 01 00 00 78 00 01 11

					/* display on + delay 120ms */

					05 01 00 00 78 00 01 29

					];

				qcom,mdss-dsi-off-command = [

					05 01 00 00 78 00 02 28 00

					05 01 00 00 78 00 02 10 00

					];

				qcom,mdss-dsi-on-command-state = "dsi_lp_mode";

				qcom,mdss-dsi-off-command-state = "dsi_lp_mode";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sm6150-audio.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -145,3 +145,13 @@ 
		elemental-addr = [ff ff ff fe 17 02];

	};

};



&qupv3_se3_i2c {

	status = "ok";

	fsa4480: fsa4480@43 {

		compatible = "qcom,fsa4480-i2c";

		reg = <0x43>;

		pinctrl-names = "default";

		pinctrl-0 = <&fsa_usbc_ana_en>;

	};

};

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+70 −0
Original line number Diff line number Diff line
@@ -632,6 +632,22 @@ 
			};

		};



		fsa_usbc_ana_en_n@114 {

			fsa_usbc_ana_en: fsa_usbc_ana_en {

				mux {

					pins = "gpio114";

					function = "gpio";

				};



				config {

					pins = "gpio114";

					drive-strength = <2>;

					bias-disable;

					output-low;

				};

			};

		};



		pmx_sde_te {

			sde_te_active: sde_te_active {

				mux {
@@ -660,6 +676,60 @@ 
			};

		};



		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {

			mux {

				pins = "gpio104";

				function = "gpio";

			};



			config {

				pins = "gpio104";

				bias-disable;

				drive-strength = <16>;

			};

		};



		sde_dp_usbplug_cc_suspend: sde_dp_usbplug_cc_suspend {

			mux {

				pins = "gpio104";

				function = "gpio";

			};



			config {

				pins = "gpio104";

				bias-pull-down;

				drive-strength = <2>;

			};

		};



		sde_dp_switch_active: sde_dp_switch_active {

			mux {

				pins = "gpio49";

				function = "gpio";

			};



			config {

				pins = "gpio49";

				bias-pull-up;		/* pull up */

				drive-strength = <2>;

			};

		};



		sde_dp_switch_suspend: sde_dp_switch_suspend {

			mux {

				pins = "gpio49";

				function = "gpio";

			};



			config {

				pins = "gpio49";

				bias-pull-down;

				drive-strength = <2>;

			};

		};







		/* SDC pin type */

		sdc1_clk_on: sdc1_clk_on {

			config {

arch/arm64/boot/dts/qcom/sm6150-sde-display.dtsi

+4 −7
Original line number Diff line number Diff line
@@ -155,17 +155,14 @@ 
		label = "wb_display";

	};



	ext_disp: qcom,msm-ext-disp {

		compatible = "qcom,msm-ext-disp";



		ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {

			compatible = "qcom,msm-ext-disp-audio-codec-rx";

		};

};



&sde_dp {

	qcom,dp-usbpd-detection = <&pm6150_pdphy>;

};



&mdss_mdp {

	connectors = <&sde_rscc &sde_wb &sde_dsi>;

	connectors = <&sde_rscc &sde_wb &sde_dp &sde_dsi>;

};



&dsi_sim_vid {