commit 0ba3f3e42af40f4d0219e124efba78152b7298b3
author Ady Abraham <adyabr@google.com> Wed Aug 21 18:35:32 2024 +0000
committer Ady Abraham <adyabr@google.com> Wed Aug 21 19:08:38 2024 +0000
tree 8056fd7255f37a92cc060692e0a600fde0edddd7
parent 73e9ae304000410d942d13e733ddc1ab303fdfd3

DO NOT MERGE Revert "DO NOT MERGE Extend mPreviousPresentFences for high refresh rate"

This reverts commit 73e9ae304000410d942d13e733ddc1ab303fdfd3.

Reason for revert: http://b/361358860

Change-Id: I7d38f19a5514ff70ea43a3533b45f3c6bf4e83c9

services/surfaceflinger/Scheduler/src/FrameTargeter.cpp

diff --git a/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp b/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
index 063f1b3..badd21e 100644
--- a/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
+++ b/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
@@ -20,20 +20,6 @@
 #include <scheduler/FrameTargeter.h>
 #include <scheduler/IVsyncSource.h>
 
-namespace {
-size_t getPresentFenceShift(Period minFramePeriod) {
-    const bool isTwoVsyncsAhead = targetsVsyncsAhead<2>(minFramePeriod);
-    size_t shift = 0;
-    if (isTwoVsyncsAhead) {
-        shift = static_cast<size_t>(expectedFrameDuration.ns() / minFramePeriod.ns());
-        if (shift >= mPresentFences.size()) {
-            shift = mPresentFences.size() - 1;
-        }
-    }
-    return shift;
-}
-} // namespace
-
 namespace android::scheduler {
 
 FrameTarget::FrameTarget(const std::string& displayLabel)
@@ -44,7 +30,7 @@
 
 TimePoint FrameTarget::pastVsyncTime(Period minFramePeriod) const {
     // TODO(b/267315508): Generalize to N VSYNCs.
-    const size_t shift = getPresentFenceShift(minFramePeriod);
+    const int shift = static_cast<int>(targetsVsyncsAhead<2>(minFramePeriod));
     return mExpectedPresentTime - Period::fromNs(minFramePeriod.ns() << shift);
 }
 
@@ -52,10 +38,8 @@
     if (FlagManager::getInstance().allow_n_vsyncs_in_targeter()) {
         return pastVsyncTimePtr();
     }
-
-    const size_t shift = getPresentFenceShift(minFramePeriod);
-    ATRACE_FORMAT("mPresentFences shift=%zu", shift);
-    return mPresentFences[shift].fenceTime;
+    const size_t i = static_cast<size_t>(targetsVsyncsAhead<2>(minFramePeriod));
+    return mPresentFences[i].fenceTime;
 }
 
 bool FrameTarget::wouldPresentEarly(Period minFramePeriod) const {
@@ -167,9 +151,7 @@
     if (FlagManager::getInstance().allow_n_vsyncs_in_targeter()) {
         addFence(std::move(presentFence), presentFenceTime, mExpectedPresentTime);
     } else {
-        for (size_t i = mPreviousPresentFences.size()-1; i >= 1; i--) {
-            mPresentFences[i] = mPresentFences[i-1];
-        }
+        mPresentFences[1] = mPresentFences[0];
         mPresentFences[0] = {std::move(presentFence), presentFenceTime, mExpectedPresentTime};
     }
     return presentFenceTime;