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

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

Merge "ARM: dts: msm: update the delay values for truly 1080p panel"

parents 97648c16 1f0d6f7a

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

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ Optional properites: 


- qcom,mdss-dsi-display-timings:	Parent node that lists the different resolutions that the panel supports.

					Each child represents timings settings for a specific resolution.

- qcom,mdss-dsi-post-init-delay:        Specifies required number of frames to wait so that panel can be functional

					to show proper display.



Additional properties added to the second level nodes that represent timings properties:

- qcom,mdss-dsi-timing-default:		Property that specifies the current child as the default

arch/arm/boot/dts/qcom/dsi-panel-truly-1080p-cmd.dtsi

+7 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 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
@@ -78,16 +78,17 @@ 
			29 01 00 00 00 00 08 d5 06 00 00 01 51 01 32

			29 01 00 00 00 00 1f c7 01 0a 11 18 26 33 3e 50 38 42 52

				60 67 6e 77 01 0a 11 18 26 33 3e 50 38 42 52 60 67 6e 77

			29 01 00 00 c8 00 14 c8 01 00 00 00 00 fc 00 00 00 00 00 fc

				00 00 00 00 00 fc 00

			29 01 00 00 14 00 14 c8 01 00 00 00 00 fc 00 00 00 00

				00 fc 00 00 00 00 00 fc 00

			05 01 00 00 14 00 02 29 00];

		qcom,mdss-dsi-off-command = [05 01 00 00 96 00 02 28 00

				 05 01 00 00 96 00 02 10 00];

		qcom,mdss-dsi-off-command = [05 01 00 00 14 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";

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

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

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

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

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

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

	};

};

arch/arm/boot/dts/qcom/dsi-panel-truly-1080p-video.dtsi

+9 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 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
@@ -52,7 +52,7 @@ 
			15 01 00 00 00 00 02 51 ff

			15 01 00 00 00 00 02 53 2c

			15 01 00 00 00 00 02 55 00

			05 01 00 00 c8 00 02 11 00

			05 01 00 00 78 00 02 11 00

			23 01 00 00 00 00 02 b0 00

			29 01 00 00 00 00 07 b3 14 00 00 00 00 00

			29 01 00 00 00 00 03 b6 3a d3
@@ -74,15 +74,16 @@ 
			29 01 00 00 00 00 08 d5 06 00 00 01 51 01 32

			29 01 00 00 00 00 1f c7 01 0a 11 18 26 33 3e 50 38 42 52

				60 67 6e 77 01 0a 11 18 26 33 3e 50 38 42 52 60 67 6e 77

			29 01 00 00 c8 00 14 c8 01 00 00 00 00 fc 00 00 00 00 00 fc

				00 00 00 00 00 fc 00

			05 01 00 00 c8 00 02 29 00];

		qcom,mdss-dsi-off-command = [05 01 00 00 96 00 02 28 00

				 05 01 00 00 96 00 02 10 00];

			29 01 00 00 14 00 14 c8 01 00 00 00 00 fc 00 00 00 00

				00 fc 00 00 00 00 00 fc 00

			05 01 00 00 14 00 02 29 00];

		qcom,mdss-dsi-off-command = [05 01 00 00 14 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";

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

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

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

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

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

	};

};

drivers/video/msm/mdss/mdss_dsi_panel.c

+3 −0
Original line number Diff line number Diff line
@@ -2390,6 +2390,9 @@ static int mdss_panel_parse_dt(struct device_node *np, 
	rc = of_property_read_u32(np, "qcom,mdss-dsi-init-delay-us", &tmp);

	pinfo->mipi.init_delay = (!rc ? tmp : 0);



	rc = of_property_read_u32(np, "qcom,mdss-dsi-post-init-delay", &tmp);

	pinfo->mipi.post_init_delay = (!rc ? tmp : 0);



	mdss_dsi_parse_roi_alignment(np, pinfo);



	mdss_dsi_parse_trigger(np, &(pinfo->mipi.mdp_trigger),

drivers/video/msm/mdss/mdss_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -1768,10 +1768,10 @@ static int mdss_fb_blank_unblank(struct msm_fb_data_type *mfd) 
			 * the backlight would remain 0 (0 is set in blank).

			 * Hence resetting back to calibration mode value

			 */

			if (!IS_CALIB_MODE_BL(mfd))

				mdss_fb_set_backlight(mfd, mfd->unset_bl_level);

			else

			if (IS_CALIB_MODE_BL(mfd))

				mdss_fb_set_backlight(mfd, mfd->calib_mode_bl);

			else if (!mfd->panel_info->mipi.post_init_delay)

				mdss_fb_set_backlight(mfd, mfd->unset_bl_level);



			/*

			 * it blocks the backlight update between unblank and