Merge "msm: mdss: Remove duplicate rotator call" (f473a4b2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_rotator.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -274,9 +274,6 @@ static void mdss_mdp_rotator_commit_wq_handler(struct work_struct *work)
		rot = container_of(work, struct mdss_mdp_rotator_session, commit_work);

		mutex_lock(&rotator_lock);
		ret = mdss_mdp_rotator_queue_helper(rot);

		atomic_inc(&rot->rot_sync_pt_data->commit_cnt);

		ret = mdss_mdp_rotator_queue_helper(rot);
		if (ret) {
		@@ -285,6 +282,8 @@ static void mdss_mdp_rotator_commit_wq_handler(struct work_struct *work)
		return;
		}

		atomic_inc(&rot->rot_sync_pt_data->commit_cnt);

		if (rot->rot_sync_pt_data)
		mdss_fb_signal_timeline(rot->rot_sync_pt_data);
		else