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

Unverified Commit 252dba5a authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

Merge tag 'LA.UM.6.4.r1-11400-8x98.0' into kernel.lnx.4.4.r27-rel 



"LA.UM.6.4.r1-11400-8x98.0"

* tag 'LA.UM.6.4.r1-11400-8x98.0':
  smb-lib: allow hvdcp if pd is disabled
  i2c-msm-v2: Handle Null pointer de-reference
  msm: adsprpc: destroy mutex before file free
  ASoC: correct read size return value for erroneous conditions
  rtac: Add mutex lock to ensure proper fops access
  UPSTREAM: binder: fix proc->files use-after-free
  UPSTREAM: Revert "FROMLIST: binder: fix proc->files use-after-free"
  diag: Prevent unnecessary data ready counter update
  diag: Increment data ready only if it is first update
  msm: ipa: Protect ipa default routing table
  soc: soundwire: Fix wsa mute issue for stereo playback
  soc: swr-wcd-ctrl: Fix wsa mute issue for stereo playback
  drm/msm: clear colorimetry block info for HDMI
  fbdev/msm: sanitize debugfs inputs when reading mdp memory
  ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660
  clk: qcom: mdss: avoid release of the dynamic fps PLL code memory
  drm/msm: fix HDR programming sequence for mastering infoframe
  drm/msm: add checksum for HDR infoframe
  ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel
  drm/msm: add additional HDR state transition
  msm: mdss: add support to switch the DSI clock dynamically
  ARM: dts: msm: add DT properties for dynamic refresh for SDM660/SDM630
  clk: qcom: mdss: add support for dynamic refresh on DSI 14nm PLL
  clk: qcom: check for change in RCG configuration during set_rate
  drivers: dma-removed: fix signedness issue
  wcnss: Fix buffer overflow in wcnss_prealloc_get
  diag: Modify md_info and diag client map synchronization
  qseecom: fix kclient free issue in qseecom_remove
  msm: ais: change csid to avoid overflow
  crypto: qcedev: Add null pointer check on sg_src
  ASoC: wsa881x: Fix regcache sync issue during playback
  USB: pd: Notify selfpowered state based on type C current
  qseecom: fix issues when processing blocked listener request
  qseecom: block system signals when waiting for listener available

Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
parents 94d5e769 b501114c

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ Optional properties: 
- qcom,mdss-dsi-border-color:		Defines the border color value if border is present.

					0 = default value.

- qcom,mdss-dsi-pan-enable-dynamic-fps:	Boolean used to enable change in frame rate dynamically.

- qcom,mdss-dsi-pan-enable-dynamic-bitclk: Boolean used to enable change in DSI clock dynamically.

- qcom,mdss-dsi-dynamic-bitclk_freq:	An array of integers that specifies the DSI bit clock

					frequencies supported as part of dynamic bit clock feature.

- qcom,mdss-dsi-pan-fps-update:		A string that specifies when to change the frame rate.

					"dfps_suspend_resume_mode"= FPS change request is

					implemented during suspend/resume.
@@ -696,6 +699,9 @@ Example: 
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

		qcom,mdss-dsi-pan-enable-dynamic-fps;

		qcom,mdss-dsi-pan-fps-update = "dfps_suspend_resume_mode";

		qcom,mdss-dsi-pan-enable-dynamic-bitclk;

		qcom,mdss-dsi-dynamic-bitclk_freq = <711037824 724453632 737869440

			751285248 764701056 778116864 791532672 804948480>;

		qcom,min-refresh-rate = <30>;

		qcom,max-refresh-rate = <60>;

		qcom,mdss-dsi-bl-pmic-bank-select = <0>;

arch/arm/boot/dts/qcom/sdm630-mdss-pll.dtsi

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* 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
@@ -19,8 +19,9 @@ 
		#clock-cells = <1>;



		reg = <0xc994400 0x588>,

		      <0xc8c2300 0x8>;

		reg-names = "pll_base", "gdsc_base";

		      <0xc8c2300 0x8>,

		      <0xc994200 0x98>;

		reg-names = "pll_base", "gdsc_base", "dynamic_pll_base";



		gdsc-supply = <&gdsc_mdss>;

arch/arm/boot/dts/qcom/sdm630-mdss.dtsi

+12 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* 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
@@ -359,10 +359,19 @@ 
				 <&clock_mmss MMSS_MDSS_ESC0_CLK>,

				 <&clock_mmss BYTE0_CLK_SRC>,

				 <&clock_mmss PCLK0_CLK_SRC>,

				 <&clock_mmss MMSS_MDSS_BYTE0_INTF_CLK>;

				 <&clock_mmss MMSS_MDSS_BYTE0_INTF_CLK>,

				 <&mdss_dsi0_pll BYTE0_MUX_CLK>,

				 <&mdss_dsi0_pll PIX0_MUX_CLK>,

				 <&mdss_dsi0_pll BYTE0_SRC_CLK>,

				 <&mdss_dsi0_pll PIX0_SRC_CLK>,

				 <&mdss_dsi0_pll SHADOW_BYTE0_SRC_CLK>,

				 <&mdss_dsi0_pll SHADOW_PIX0_SRC_CLK>;

			clock-names = "byte_clk", "pixel_clk", "core_clk",

				"byte_clk_rcg", "pixel_clk_rcg",

				"byte_intf_clk";

				"byte_intf_clk", "pll_byte_clk_mux",

				"pll_pixel_clk_mux", "pll_byte_clk_src",

				"pll_pixel_clk_src", "pll_shadow_byte_clk_src",

				"pll_shadow_pixel_clk_src";



			qcom,platform-strength-ctrl = [ff 06

							ff 06

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

+6 −1
Original line number Diff line number Diff line
@@ -406,9 +406,14 @@ 
		};



		cont_splash_mem: splash_region@9d400000 {

			reg = <0x0 0x9d400000 0x0 0x02400000>;

			reg = <0x0 0x9d400000 0x0 0x23ff000>;

			label = "cont_splash_mem";

		};



		dfps_data_mem: dfps_data_mem@0x9f7ff000 {

		       reg = <0 0x9f7ff000 0 0x00001000>;

		       label = "dfps_data_mem";

		};

	};



	bluetooth: bt_wcn3990 {

arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ 
	qcom,mdss-dsi-panel-max-error-count = <3>;

	qcom,mdss-dsi-min-refresh-rate = <53>;

	qcom,mdss-dsi-max-refresh-rate = <60>;

	qcom,mdss-dsi-pan-enable-dynamic-bitclk;

	qcom,mdss-dsi-dynamic-bitclk_freq = <798240576 801594528 804948480

		808302432 811656384>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};