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

Commit 4eb23fe0 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: enable register read based ESD for sdm660"

parents 7684fb14 69561f90

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

+14 −2
Original line number Diff line number Diff line
@@ -147,7 +147,13 @@ 
		23 1e 07 08 05 03 04 a0

		23 18 07 08 04 03 04 a0];

	qcom,esd-check-enabled;

	qcom,mdss-dsi-panel-status-check-mode = "bta_check";

	qcom,mdss-dsi-panel-status-check-mode = "reg_read";

	qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];

	qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode";

	qcom,mdss-dsi-panel-status-value = <0x9c>;

	qcom,mdss-dsi-panel-on-check-value = <0x9c>;

	qcom,mdss-dsi-panel-status-read-length = <1>;

	qcom,mdss-dsi-panel-max-error-count = <3>;

};



&dsi_dual_nt36850_truly_cmd {
@@ -195,7 +201,13 @@ 
		20 12 05 06 03 13 04 a0];

	qcom,config-select = <&dsi_nt35597_truly_dsc_cmd_config2>;

	qcom,esd-check-enabled;

	qcom,mdss-dsi-panel-status-check-mode = "bta_check";

	qcom,mdss-dsi-panel-status-check-mode = "reg_read";

	qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];

	qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode";

	qcom,mdss-dsi-panel-status-value = <0x9c>;

	qcom,mdss-dsi-panel-on-check-value = <0x9c>;

	qcom,mdss-dsi-panel-status-read-length = <1>;

	qcom,mdss-dsi-panel-max-error-count = <3>;

};



&dsi_dual_nt35597_video {

drivers/video/fbdev/msm/mdss_dsi_host.c

+8 −3
Original line number Diff line number Diff line
@@ -3031,7 +3031,10 @@ bool mdss_dsi_ack_err_status(struct mdss_dsi_ctrl_pdata *ctrl) 
		 * warning message is ignored.

		 */

		if (ctrl->panel_data.panel_info.esd_check_enabled &&

			(ctrl->status_mode == ESD_BTA) && (status & 0x1008000))

			((ctrl->status_mode == ESD_BTA) ||

			 (ctrl->status_mode == ESD_REG) ||

			 (ctrl->status_mode == ESD_REG_NT35596)) &&

			 (status & 0x1008000))

			return false;



		pr_err("%s: status=%x\n", __func__, status);
@@ -3262,7 +3265,9 @@ irqreturn_t mdss_dsi_isr(int irq, void *ptr) 
		 * cleared.

		 */

		if (ctrl->panel_data.panel_info.esd_check_enabled &&

			(ctrl->status_mode == ESD_BTA) &&

			((ctrl->status_mode == ESD_BTA) ||

			 (ctrl->status_mode == ESD_REG) ||

			 (ctrl->status_mode == ESD_REG_NT35596)) &&

			 (ctrl->panel_mode == DSI_VIDEO_MODE)) {

			isr &= ~DSI_INTR_ERROR;

			/* clear only overflow */