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

Commit 68b362a9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I72b77267,I75220a44 into dev/msm-4.14-display 

* changes:
  drm/msm/sde: allow selection of panel TE GPIOs
  ARM: msm: dts: add support for 1080p panel for SM8150
parents 0e79de58 de1dfc1f

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/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";

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

+13 −0
Original line number Diff line number Diff line
@@ -739,3 +739,16 @@ 
		};

	};

};



&dsi_sharp_1080_cmd {

	qcom,mdss-dsi-t-clk-post = <0x16>;

	qcom,mdss-dsi-t-clk-pre = <0x16>;

	qcom,mdss-dsi-display-timings {

		timing@0{

			qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07

			       07 04 03 04 00 16 16];

			qcom,display-topology = <1 0 1>;

			qcom,default-topology-index = <0>;

		};

	};

};

drivers/gpu/drm/msm/sde/sde_encoder.c

+3 −1
Original line number Diff line number Diff line
@@ -1659,12 +1659,14 @@ static void _sde_encoder_update_vsync_source(struct sde_encoder_virt *sde_enc, 
	}



	if (disp_info->capabilities & MSM_DISPLAY_CAP_CMD_MODE) {



		if (is_dummy)

			vsync_source = SDE_VSYNC_SOURCE_WD_TIMER_1;

		else if (disp_info->is_te_using_watchdog_timer)

			vsync_source = SDE_VSYNC_SOURCE_WD_TIMER_0;

		else

			vsync_source = SDE_VSYNC0_SOURCE_GPIO;

			vsync_source =

				sde_enc->cur_master->hw_pp->caps->te_source;



		for (i = 0; i < sde_enc->num_phys_encs; i++) {

			phys = sde_enc->phys_encs[i];

drivers/gpu/drm/msm/sde/sde_hw_catalog.c

+6 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ enum { 
	DITHER_LEN,

	DITHER_VER,

	PP_MERGE_3D_ID,

	TE_SOURCE,

	PP_PROP_MAX,

};
@@ -634,6 +635,7 @@ static struct sde_prop_type pp_prop[] = { 
	{DITHER_LEN, "qcom,sde-dither-size", false, PROP_TYPE_U32},

	{DITHER_VER, "qcom,sde-dither-version", false, PROP_TYPE_U32},

	{PP_MERGE_3D_ID, "qcom,sde-pp-merge-3d-id", false, PROP_TYPE_U32_ARRAY},

	{TE_SOURCE, "qcom,sde-te-source", false, PROP_TYPE_U32_ARRAY},

};



static struct sde_prop_type dsc_prop[] = {
@@ -2819,6 +2821,10 @@ static int sde_pp_parse_dt(struct device_node *np, struct sde_mdss_cfg *sde_cfg) 
		snprintf(pp->name, SDE_HW_BLK_NAME_LEN, "pingpong_%u",

				pp->id - PINGPONG_0);

		pp->len = PROP_VALUE_ACCESS(prop_value, PP_LEN, 0);

		pp->te_source = PROP_VALUE_ACCESS(prop_value, TE_SOURCE, i);

		if (!prop_exists[TE_SOURCE] ||

			pp->te_source > SDE_VSYNC_SOURCE_WD_TIMER_0)

			pp->te_source = SDE_VSYNC0_SOURCE_GPIO;



		sblk->te.base = PROP_VALUE_ACCESS(prop_value, TE_OFF, i);

		sblk->te.id = SDE_PINGPONG_TE;