Merge "msm: mdss: add mutex locking when BTA is triggered" (0a64c718) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_host.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -991,6 +991,8 @@ int mdss_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		return 0;
		}

		mutex_lock(&ctrl_pdata->cmd_mutex);

		pr_debug("%s: Checking Register status\n", __func__);

		mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 1);
		@@ -1017,6 +1019,8 @@ int mdss_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 0);
		pr_debug("%s: Read register done with ret: %d\n", __func__, ret);

		mutex_unlock(&ctrl_pdata->cmd_mutex);

		return ret;
		}

		@@ -1154,6 +1158,8 @@ int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		return 0;
		}

		mutex_lock(&ctrl_pdata->cmd_mutex);

		pr_debug("%s: Checking BTA status\n", __func__);

		mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 1);
		@@ -1174,6 +1180,8 @@ int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 0);
		pr_debug("%s: BTA done with ret: %d\n", __func__, ret);

		mutex_unlock(&ctrl_pdata->cmd_mutex);

		return ret;
		}