Merge "msm: mdss: fix potential crash when sending backlight DCS commands" (2ce2e094) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_host.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2008,7 +2008,6 @@ int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp)
		ctrl->mdss_util->bus_scale_set_quota(MDSS_DSI_RT, SZ_1M, SZ_1M);

		pr_debug("%s: from_mdp=%d pid=%d\n", __func__, from_mdp, current->pid);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);

		if (ctrl->mdss_util->iommu_ctrl) {
		rc = ctrl->mdss_util->iommu_ctrl(1);
		@@ -2019,6 +2018,8 @@ int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp)
		}
		}

		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);

		if (req->flags & CMD_REQ_HS_MODE)
		mdss_dsi_set_tx_power_mode(0, &ctrl->panel_data);