Merge "msm: mdss: remove cleanup done during overlay kickoff" (a23ecb76) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -846,7 +846,7 @@ static void mdss_mdp_overlay_update_pm(struct mdss_overlay_private *mdp5_data)
		int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd)
		{
		struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
		struct mdss_mdp_pipe pipe, next;
		struct mdss_mdp_pipe *pipe;
		struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
		struct mdss_mdp_ctl *tmp;
		int ret;
		@@ -866,8 +866,7 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd)
		return ret;
		}

		list_for_each_entry_safe(pipe, next, &mdp5_data->pipes_used,
		used_list) {
		list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
		struct mdss_mdp_data *buf;
		/*
		* When external is connected and no dedicated wfd is present,
		@@ -905,12 +904,6 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd)
		pipe->params_changed++;
		buf = &pipe->front_buf;
		} else if (!pipe->params_changed) {
		if (pipe->mixer && !mdss_mdp_pipe_is_staged(pipe) &&
		!list_empty(&pipe->used_list)) {
		list_del_init(&pipe->used_list);
		list_add(&pipe->cleanup_list,
		&mdp5_data->pipes_cleanup);
		}
		continue;
		} else if (pipe->front_buf.num_planes) {
		buf = &pipe->front_buf;