Merge "msm: mdss: set pipe to solid fill when releasing it" (f3e1e2f1) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/video/msm/mdss/mdss_mdp_overlay.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1024,6 +1024,15 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd,
		if (data)
		mdss_mdp_set_roi(ctl, data);

		/*
		* Setup pipe in solid fill before unstaging,
		* to ensure no fetches are happening after dettach or reattach.
		*/
		list_for_each_entry(pipe, &mdp5_data->pipes_cleanup, cleanup_list) {
		mdss_mdp_pipe_queue_data(pipe, NULL);
		mdss_mdp_mixer_pipe_unstage(pipe);
		}

		list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
		struct mdss_mdp_data *buf;
		/*
		@@ -1157,7 +1166,6 @@ static int mdss_mdp_overlay_release(struct msm_fb_data_type *mfd, int ndx)
		&mdp5_data->pipes_cleanup);
		}
		mutex_unlock(&mfd->lock);
		mdss_mdp_mixer_pipe_unstage(pipe);
		mdss_mdp_pipe_unmap(pipe);
		if (destroy_pipe)
		mdss_mdp_pipe_destroy(pipe);