Merge "msm: mdss: hold mdp clock ref count when restoring ctl path" (c51a3295) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_ctl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1727,11 +1727,13 @@ void mdss_mdp_ctl_restore(struct mdss_mdp_ctl *ctl)
		{
		u32 temp;

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		temp = readl_relaxed(ctl->mdata->mdp_base +
		MDSS_MDP_REG_DISP_INTF_SEL);
		temp \|= (ctl->intf_type << ((ctl->intf_num - MDSS_MDP_INTF0) * 8));
		writel_relaxed(temp, ctl->mdata->mdp_base +
		MDSS_MDP_REG_DISP_INTF_SEL);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		}

		static int mdss_mdp_ctl_start_sub(struct mdss_mdp_ctl *ctl, bool handoff)