fbdev: msm: Set the commit_in_progress flag after sync_fence_wait

The commit_in_progress flag is set only after waiting for the fences
in the current composition cycle. This will ensure that the
release fence of the previous composition is signalled, even though
there is a fence timeout in the current composition cycle.

Change-Id: I06653c922f195bb5936530ddeaa5a9fcb291fb3f
Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
This commit is contained in:
Krishna Manikandan 2018-01-08 12:40:08 +05:30
parent 55cc722ec6
commit 2f6b566fe6

View file

@ -1,4 +1,4 @@
/* 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 * 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 * 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 { } else {
sctl_flush_bits = sctl->flush_bits; sctl_flush_bits = sctl->flush_bits;
} }
sctl->commit_in_progress = true;
} }
ctl->commit_in_progress = true;
ctl_flush_bits = ctl->flush_bits; ctl_flush_bits = ctl->flush_bits;
ATRACE_END("postproc_programming"); 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, MDP_COMMIT_STAGE_SETUP_DONE,
commit_cb->data); commit_cb->data);
ret = mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_READY); 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 * When wait for fence timed out, driver ignores the fences