Merge "msm: mdss: ensure atomic access to pipe clock management" (4eaa2051) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_pipe.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -564,6 +564,8 @@ static struct mdss_mdp_pipe mdss_mdp_pipe_init(struct mdss_mdp_mixer mixer,
		if (mdss_mdp_pipe_is_sw_reset_available(mdata)) {
		force_off_mask =
		BIT(pipe->clk_ctrl.bit_off + CLK_FORCE_OFF_OFFSET);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mutex_lock(&mdata->reg_lock);
		reg_val = readl_relaxed(mdata->mdp_base +
		pipe->clk_ctrl.reg_off);
		if (reg_val & force_off_mask) {
		@@ -571,6 +573,8 @@ static struct mdss_mdp_pipe mdss_mdp_pipe_init(struct mdss_mdp_mixer mixer,
		writel_relaxed(reg_val,
		mdata->mdp_base + pipe->clk_ctrl.reg_off);
		}
		mutex_unlock(&mdata->reg_lock);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		}

		if (pipe) {