SF: VSyncReactor ensure period change confirmation
(Code being corrected is flagged off, no production problems)
When a period change is happening, system turns on hwvsync and uses
the first vsync signal timed at the new vsync rate as confirmation
that the rate has indeed changed (and then things like modifying the
offsets occurs).
If a presentation fence was added to the VSyncReactor system before
the first hwvsync sample arrived, this would result in the period never
being confirmed, and would result in incorrect offsets and period
estimations, resulting in bad jank scores.
Test: 3 unit tests
Test: uibench run
Fixes: 147321414
Change-Id: Idbc87529e60333df5180de585dbba3525396562b
diff --git a/services/surfaceflinger/Scheduler/VSyncReactor.cpp b/services/surfaceflinger/Scheduler/VSyncReactor.cpp
index a652053..158a184 100644
--- a/services/surfaceflinger/Scheduler/VSyncReactor.cpp
+++ b/services/surfaceflinger/Scheduler/VSyncReactor.cpp
@@ -175,10 +175,25 @@
return mTracker->nextAnticipatedVSyncTimeFrom(mClock->now());
}
+void VSyncReactor::startPeriodTransition(nsecs_t newPeriod) {
+ mPeriodTransitioningTo = newPeriod;
+ mMoreSamplesNeeded = true;
+}
+
+void VSyncReactor::endPeriodTransition() {
+ mPeriodTransitioningTo.reset();
+ mLastHwVsync.reset();
+ mMoreSamplesNeeded = false;
+}
+
void VSyncReactor::setPeriod(nsecs_t period) {
std::lock_guard lk(mMutex);
mLastHwVsync.reset();
- mPeriodTransitioningTo = period;
+ if (period == getPeriod()) {
+ endPeriodTransition();
+ } else {
+ startPeriodTransition(period);
+ }
}
nsecs_t VSyncReactor::getPeriod() {
@@ -202,16 +217,13 @@
std::lock_guard<std::mutex> lk(mMutex);
if (periodChangeDetected(timestamp)) {
- mMoreSamplesNeeded = false;
- *periodFlushed = true;
-
mTracker->setPeriod(*mPeriodTransitioningTo);
for (auto& entry : mCallbacks) {
entry.second->setPeriod(*mPeriodTransitioningTo);
}
- mPeriodTransitioningTo.reset();
- mLastHwVsync.reset();
+ endPeriodTransition();
+ *periodFlushed = true;
} else if (mPeriodTransitioningTo) {
mLastHwVsync = timestamp;
mMoreSamplesNeeded = true;