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
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;