Merge "msm: mdss: fix sync fence deadlock when rotator is used" (d7db7b28) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+0 −40

Original line number	Diff line number	Diff line
		@@ -1599,44 +1599,6 @@ end:
		return ret;
		}

		static void mdss_mdp_overlay_force_cleanup(struct msm_fb_data_type *mfd)
		{
		struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
		struct mdss_mdp_ctl *ctl = mdp5_data->ctl;
		int ret;

		pr_debug("forcing cleanup to unset dma pipes on fb%d\n", mfd->index);

		/*
		* video mode panels require the layer to be unstaged and wait for
		* vsync to be able to release buffer.
		*/
		if (ctl && ctl->is_video_mode) {
		ret = mdss_mdp_display_commit(ctl, NULL);
		if (!IS_ERR_VALUE(ret))
		mdss_mdp_display_wait4comp(ctl);
		}

		mdss_mdp_overlay_cleanup(mfd);
		}

		static void mdss_mdp_overlay_force_dma_cleanup(struct mdss_data_type *mdata)
		{
		struct mdss_mdp_pipe *pipe;
		int i;

		for (i = 0; i < mdata->ndma_pipes; i++) {
		pipe = mdata->dma_pipes + i;

		if (!mdss_mdp_pipe_map(pipe)) {
		struct msm_fb_data_type *mfd = pipe->mfd;
		mdss_mdp_pipe_unmap(pipe);
		if (mfd)
		mdss_mdp_overlay_force_cleanup(mfd);
		}
		}
		}

		static int mdss_mdp_overlay_play(struct msm_fb_data_type *mfd,
		struct msmfb_overlay_data *req)
		{
		@@ -1661,8 +1623,6 @@ static int mdss_mdp_overlay_play(struct msm_fb_data_type *mfd,
		}

		if (req->id & MDSS_MDP_ROT_SESSION_MASK) {
		mdss_mdp_overlay_force_dma_cleanup(mfd_to_mdata(mfd));

		ret = mdss_mdp_rotator_play(mfd, req);
		} else if (req->id == BORDERFILL_NDX) {
		pr_debug("borderfill enable\n");