commit fe3af7c211197a4f2b3ed6b26198696f34b93d35
author Rachel Lee <rnlee@google.com> Tue Jun 20 21:11:43 2023 +0000
committer Rachel Lee <rnlee@google.com> Mon Jun 26 18:05:08 2023 +0000
tree b91098204bfebfd64e5eaf9404289a7d168db8ab
parent 042a7a0b193b832dbe080358bf9c1c7a78c16b95

Revert "Don't clear timestamps when enabling HW vsync."

This reverts commit 2db205d8d24d381a5d52e0407312daa4fc7caf15.

Reason for revert: b/285086044, b/285401355

Change-Id: I0f642f0ead5a70daec649095855ec0209d2c0682

services/surfaceflinger/Scheduler/VsyncSchedule.cpp

diff --git a/services/surfaceflinger/Scheduler/VsyncSchedule.cpp b/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
index 5691792..ff3f29d 100644
--- a/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
+++ b/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
@@ -17,7 +17,6 @@
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
 #include <ftl/fake_guard.h>
-#include <gui/TraceUtils.h>
 #include <scheduler/Fps.h>
 #include <scheduler/Timer.h>
 
@@ -145,14 +144,6 @@
 }
 
 bool VsyncSchedule::addResyncSample(TimePoint timestamp, ftl::Optional<Period> hwcVsyncPeriod) {
-    ATRACE_CALL();
-
-    if (mClearTimestampsOnNextSample) {
-        ATRACE_FORMAT("clearing sample after HW vsync enabled", __func__);
-        getTracker().resetModel();
-        mClearTimestampsOnNextSample = false;
-    }
-
     bool needsHwVsync = false;
     bool periodFlushed = false;
     {
@@ -179,7 +170,7 @@
 
 void VsyncSchedule::enableHardwareVsyncLocked() {
     if (mHwVsyncState == HwVsyncState::Disabled) {
-        mClearTimestampsOnNextSample = true;
+        getTracker().resetModel();
         mRequestHardwareVsync(mId, true);
         mHwVsyncState = HwVsyncState::Enabled;
     }