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

Commit db337ad0 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:
  msm/sde/rotator: reduce log level of sde_rotator_footswitch_ctrl
  drm/msm/sde: add property to select dpu smmu mapping based on hw version
  drm/msm/hdcp2.2: return proper error code on aux failures
  ARM: dts: msm: Add panel TE source information for SM8150
  drm/msm/sde: use vsync source information from interfaces
  drm/msm/dsi-staging: set default topology
  msm: sde: add property to select rotator smmu mapping based on hw version
  ARM: dts: msm: Modify the panel max brightness level for QRD SM8150
  drm/msm/dsi-staging: fix mem leak issue in ESD debugfs
  drm/msm/dsi-staging: set correct flags for MAX_RETURN_PACKET command

Change-Id: I39f9e333f11e2a25b082f58fc3bbc76198070c72
Signed-off-by: default avatarNamratha Siddappa <namratha@codeaurora.org>
parents 4424b4d6 26c3cd9b

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

+3 −3
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ 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
@@ -142,6 +140,8 @@ Optional properties: 
				feature is available or not.

- qcom,sde-has-idle-pc:		Boolean property to indicate if target has idle

				power collapse feature available or not.

- qcom,fullsize-va-map:		Boolean property to indicate smmu mapping range

				for mdp should be full range (4GB).

- qcom,sde-has-mixer-gc:	Boolean property to indicate if mixer has gamma correction

				feature available or not.

- qcom,sde-has-dest-scaler: 	Boolean property to indicate if destination scaler
@@ -537,7 +537,6 @@ 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>;
@@ -605,6 +604,7 @@ Example: 
    qcom,sde-highest-bank-bit = <15>;

    qcom,sde-has-mixer-gc;

    qcom,sde-has-idle-pc;

    qcom,fullsize-va-map;

    qcom,sde-has-dest-scaler;

    qcom,sde-max-dest-scaler-input-linewidth = <2048>;

    qcom,sde-max-dest-scaler-output-linewidth = <2560>;

Documentation/devicetree/bindings/drm/msm/sde-dsi.txt

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ Bus Scaling Data: 
Optional properties:

- label:                  String to describe controller.

- qcom,platform-te-gpio:  Specifies the gpio used for TE.

- qcom,panel-te-source:  Specifies the source pin for Vsync from panel or WD Timer.

- qcom,dsi-display-active: Current active display

- qcom,dsi-ctrl: handle to dsi controller device

- qcom,dsi-phy: handle to dsi phy device

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

+6 −6
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

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

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

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

	qcom,mdss-brightness-max-level = <1023>;

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

	qcom,mdss-brightness-max-level = <255>;

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

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

	qcom,platform-te-gpio = <&tlmm 8 0>;
@@ -144,8 +144,8 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

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

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

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

	qcom,mdss-brightness-max-level = <1023>;

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

	qcom,mdss-brightness-max-level = <255>;

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

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

	qcom,platform-te-gpio = <&tlmm 8 0>;
@@ -156,8 +156,8 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

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

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

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

	qcom,mdss-brightness-max-level = <1023>;

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

	qcom,mdss-brightness-max-level = <255>;

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ 
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;



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

		qcom,panel-te-source = <0>;



		vddio-supply = <&pm8150_l14>;

		lab-supply = <&lcdb_ldo_vreg>;
@@ -411,6 +412,7 @@ 
		pinctrl-1 = <&sde_dsi1_suspend &sde_te1_suspend>;



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

		qcom,panel-te-source = <1>;



		vddio-supply = <&pm8150_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

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

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
		qcom,sde-pp-slave = <0x0 0x0 0x0 0x0 0x0 0x0>;

		qcom,sde-pp-size = <0xd4>;

		qcom,sde-pp-merge-3d-id = <0x0 0x0 0x1 0x1 0x2 0x2>;

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



		qcom,sde-merge-3d-off = <0x84000 0x84100 0x84200>;

		qcom,sde-merge-3d-size = <0x100>;