Merge "fbdev/msm: Modify cdm block destroy sequence" (8cd80fc3) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_intf_video.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -1097,13 +1097,6 @@ static int mdss_mdp_video_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		{
		int intfs_num, ret = 0;

		if (ctl->cdm) {
		if (!mdss_mdp_cdm_destroy(ctl->cdm))
		mdss_mdp_ctl_write(ctl,
		MDSS_MDP_REG_CTL_FLUSH, BIT(26));
		ctl->cdm = NULL;
		}

		intfs_num = ctl->intf_num - MDSS_MDP_INTF0;
		ret = mdss_mdp_video_intfs_stop(ctl, ctl->panel_data, intfs_num);
		if (IS_ERR_VALUE(ret)) {
		@@ -1111,6 +1104,12 @@ static int mdss_mdp_video_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		return ret;
		}

		if (ctl->cdm) {
		if (!mdss_mdp_cdm_destroy(ctl->cdm))
		mdss_mdp_ctl_write(ctl,
		MDSS_MDP_REG_CTL_FLUSH, BIT(26));
		ctl->cdm = NULL;
		}
		MDSS_XLOG(ctl->num, ctl->vsync_cnt);

		mdss_mdp_ctl_reset(ctl, false);