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

Commit 1499185f 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:
  drm/msm/sde: allow PM_QOS vote for all command mode panels
  drm/msm/sde: fix race condition in vblank control interrupts
  drm/msm/sde: add debugfs node in dpu driver to give fps
  drm/msm/sde: add reg bus vote for histogram and AD
  drm/msm: add pointer check before dereference
  drm/msm/sde: fix race condition in client_event_list deregister
  drm/msm/sde: Initialize REG_DMA sspp_buf for all the rects
  drm/msm/dp: add error handling for stream enable failures
  ARM: dts: msm: add dsi secondary node for SM8150
  drm/msm/sde: report rsc timeout state
  drm/msm/dp: release the audio ops lock for failure cases
  ARM: dts: msm: add display preferences for sm8150
  drm/msm/sde: allow selection of panel TE GPIOs
  ARM: msm: dts: add support for 1080p panel for SM8150
  drm/msm/sde: populate primary display flag
  drm/msm: avoid sde rsc debug mode access during idle pc
  drm/msm/sde: log ubwc decode errors for planes
  drm: limit number of blob property allocation
  drm/msm/sde: Set IPC reset for AD4 when it's enabled
  ARM: dts: msm: update panel jitter value for sw43404 panel
  drm/msm/sde: skip IRQ_NOAUTOEN if pwr_en event called before irq install
  ARM: dts: msm: update DSI phy timings for SM8150
  drm/msm/dsi-staging: free pps command transmit buffer
  ARM: dts: msm: Add HDR support for OLED panel
  drm/msm/dp: protect mst add_connector process with mode_lock
  drm/msm/dsi-staging: allow empty timing for DSI external mode
  drm/msm: retry disabling modes on -ERESTARTSYS during lastclose
  drm/msm/sde: add hw log mask for REGDMA
  drm/msm/dsi-staging: add support for secondary display
  drm/msm/dsi-staging: fix dsi clock calculation for low bpp

Change-Id: Ib8475bd842e1164c91a71ec9e158c6deb145f8d4
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 23cc55e8 a349fc21

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

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ Optional properties: 
- qcom,sde-dsc-size:		A u32 value indicates the address range for each dsc.

- qcom,sde-cdm-size:		A u32 value indicates the address range for each cdm.

- qcom,sde-pp-size:		A u32 value indicates the address range for each pingpong.

- qcom,sde-te-source:		Array of GPIO sources indicating which pingpong TE is

				sourced to which panel TE gpio.

- qcom,sde-wb-size:		A u32 value indicates the address range for each writeback.

- qcom,sde-len:			A u32 entry for SDE address range.

- qcom,sde-intf-max-prefetch-lines:	Array of u32 values for max prefetch lines on
@@ -535,6 +537,7 @@ Example: 
    qcom,sde-pp-off = <0x00071000 0x00071800

			  0x00072000 0x00072800>;

    qcom,sde-pp-slave = <0x0 0x0 0x0 0x0>;

    qcom,sde-te-source = <0x0 0x1 0x0 0x0>;

    qcom,sde-cdm-off = <0x0007a200>;

    qcom,sde-dsc-off = <0x00081000 0x00081400>;

    qcom,sde-intf-max-prefetch-lines = <0x15 0x15 0x15 0x15>;

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-fhd-plus-cmd.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ 
		qcom,mdss-dsi-te-using-te-pin;

		qcom,mdss-pan-physical-width-dimension = <68>;

		qcom,mdss-pan-physical-height-dimension = <138>;

		qcom,mdss-dsi-panel-hdr-enabled;

		qcom,mdss-dsi-panel-hdr-color-primaries = <14500 15500 32000

			17000 15500 30000 8000 3000>;

		qcom,mdss-dsi-panel-peak-brightness = <4200000>;

		qcom,mdss-dsi-panel-blackness-level = <3230>;



		qcom,mdss-dsi-display-timings {

			timing@0{

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ 
		qcom,mdss-dsi-te-dcs-command = <1>;

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

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

		qcom,mdss-dsi-panel-hdr-enabled;

		qcom,mdss-dsi-panel-hdr-color-primaries = <14500 15500 32000

			17000 15500 30000 8000 3000>;

		qcom,mdss-dsi-panel-peak-brightness = <4200000>;

		qcom,mdss-dsi-panel-blackness-level = <3230>;



		qcom,mdss-dsi-display-timings {

			timing@0{
@@ -57,7 +62,7 @@ 
				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-jitter = <0x1 0x1>;

				qcom,mdss-dsi-panel-jitter = <0x4 0x1>;

				qcom,mdss-dsi-on-command = [

					39 01 00 00 00 00 03 b0 a5 00

					07 01 00 00 00 00 02 01 00

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ 
	qcom,mdss-dsi-mdp-trigger = "none";

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

	qcom,adjust-timer-wakeup-ms = <1>;

	qcom,mdss-dsi-panel-hdr-enabled;

	qcom,mdss-dsi-panel-hdr-color-primaries = <14500 15500 32000

		17000 15500 30000 8000 3000>;

	qcom,mdss-dsi-panel-peak-brightness = <4200000>;

	qcom,mdss-dsi-panel-blackness-level = <3230>;



	qcom,mdss-dsi-display-timings {

		timing@0{

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

arch/arm64/boot/dts/qcom/sm8150-cdp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -211,6 +211,17 @@ 
	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_1080_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 7 0>;

	qcom,platform-te-gpio = <&tlmm 8 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_nt35695b_truly_fhd_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";