Merge "ARM: dts: msm: enable bta check for nt35597 panel on msm8996" (acb25020) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,8 @@
		23 1e 07 08 05 03 04 a0
		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";
		};

		&dsi_dual_nt35597_cmd {
		@@ -184,6 +186,8 @@
		23 1e 07 08 05 03 04 a0
		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";
		};

		&dsi_nt35597_dsc_video {
		@@ -192,6 +196,8 @@
		20 1d 05 07 03 03 04 a0
		20 1d 05 07 03 03 04 a0
		20 12 05 06 03 13 04 a0];
		qcom,esd-check-enabled;
		qcom,mdss-dsi-panel-status-check-mode = "bta_check";
		};

		&dsi_nt35597_dsc_cmd {
		@@ -200,6 +206,8 @@
		20 1d 05 07 03 03 04 a0
		20 1d 05 07 03 03 04 a0
		20 12 05 06 03 13 04 a0];
		qcom,esd-check-enabled;
		qcom,mdss-dsi-panel-status-check-mode = "bta_check";
		};

		&dsi_dual_jdi_4k_nofbc_video {

+3 −3

Original line number	Diff line number	Diff line
		@@ -126,15 +126,15 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval)
		*/

		mutex_lock(&ctrl_pdata->mutex);
		mutex_lock(&ctl->offlock);
		if (mipi->mode == DSI_CMD_MODE)
		mutex_lock(&mdp5_data->ov_lock);
		mutex_lock(&ctl->offlock);

		if (mdss_panel_is_power_off(pstatus_data->mfd->panel_power_state) \|\|
		pstatus_data->mfd->shutdown_pending) {
		mutex_unlock(&ctl->offlock);
		if (mipi->mode == DSI_CMD_MODE)
		mutex_unlock(&mdp5_data->ov_lock);
		mutex_unlock(&ctl->offlock);
		mutex_unlock(&ctrl_pdata->mutex);
		pr_err("%s: DSI turning off, avoiding panel status check\n",
		__func__);
		@@ -160,9 +160,9 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval)
		ret = ctrl_pdata->check_status(ctrl_pdata);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		mutex_unlock(&ctl->offlock);
		if (mipi->mode == DSI_CMD_MODE)
		mutex_unlock(&mdp5_data->ov_lock);
		mutex_unlock(&ctl->offlock);
		mutex_unlock(&ctrl_pdata->mutex);

		if ((pstatus_data->mfd->panel_power_state == MDSS_PANEL_POWER_ON)) {