commit a1c057f02732a9c47c910c1b1181c0cc40953dde
author Matt Buckley <mattbuckley@google.com> Mon Aug 01 21:45:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 01 21:45:32 2022 +0000
tree 0321749eeabccd1bc891db5225149c222bbd42bb
parent 5e01f670532e9084db5da559422ea3db4e0a84e6
parent 672e526d76b2a7835455030e9efc80e78da10a22

Merge "Get vsync period for ADPF CPU hints in SF using display mode" into tm-qpr-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cbc068f..8621d31 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2087,11 +2087,9 @@
     // Save this once per commit + composite to ensure consistency
     mPowerHintSessionEnabled = mPowerAdvisor->usePowerHintSession();
     if (mPowerHintSessionEnabled) {
-        nsecs_t vsyncPeriod;
-        {
-            Mutex::Autolock lock(mStateLock);
-            vsyncPeriod = getVsyncPeriodFromHWC();
-        }
+        const auto& display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked()).get();
+        // get stable vsync period from display mode
+        const nsecs_t vsyncPeriod = display->getActiveMode()->getVsyncPeriod();
         mPowerAdvisor->setCommitStart(frameTime);
         mPowerAdvisor->setExpectedPresentTime(mExpectedPresentTime);
         const nsecs_t idealSfWorkDuration =