Merge "fbdev: msm: Set the commit_in_progress flag after sync_fence_wait" (24a4718f) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_ctl.c

+4 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -5912,9 +5912,7 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl ctl, void arg,
		} else {
		sctl_flush_bits = sctl->flush_bits;
		}
		sctl->commit_in_progress = true;
		}
		ctl->commit_in_progress = true;
		ctl_flush_bits = ctl->flush_bits;

		ATRACE_END("postproc_programming");
		@@ -5928,6 +5926,9 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl ctl, void arg,
		MDP_COMMIT_STAGE_SETUP_DONE,
		commit_cb->data);
		ret = mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_READY);
		ctl->commit_in_progress = true;
		if (sctl)
		sctl->commit_in_progress = true;

		/*
		* When wait for fence timed out, driver ignores the fences