commit 73e9ae304000410d942d13e733ddc1ab303fdfd3
author Ady Abraham <adyabr@google.com> Tue Aug 20 17:54:56 2024 +0000
committer Ady Abraham <adyabr@google.com> Tue Aug 20 21:00:20 2024 +0000
tree 902e639b7405098ea6647a8efd95719ece28384b
parent 7e84455e4c8a0b751c4524ebfed8f0c12c9f29a0

DO NOT MERGE Extend mPreviousPresentFences for high refresh rate

To provide hardware enough time to display a frame under high refresh
rate with long sf-duration, we extend mPreviousPresentFences by storing
extra slots. We check proper present fence at different moment
according to vsync period and sf-duration.

Bug: 241193992
Bug: 361005063
Change-Id: Id44127cb9391799b17834cff0b2e637f273ee2d1

services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h

diff --git a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
index d37d2dc..638a6fb 100644
--- a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
+++ b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
@@ -106,7 +106,8 @@
         FenceTimePtr fenceTime = FenceTime::NO_FENCE;
         TimePoint expectedPresentTime = TimePoint();
     };
-    std::array<FenceWithFenceTime, 2> mPresentFences;
+    // size should be longest sf-duration / shortest vsync period and round up
+    std::array<FenceWithFenceTime, 5> mPresentFences; // currently consider 166hz.
     utils::RingBuffer<FenceWithFenceTime, 5> mFenceWithFenceTimes;
 
     TimePoint mLastSignaledFrameTime;

services/surfaceflinger/Scheduler/src/FrameTargeter.cpp

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