commit f2f40f4de6991c1acd091bc486894863518ae285
author ramindani <ramindani@google.com> Tue Jun 18 16:48:28 2024 -0700
committer ramindani <ramindani@google.com> Thu Jun 20 15:00:23 2024 -0700
tree e5255b4e3e87b3a3e4500368bb4bd5ef2fc1281b
parent a3be80cbc647821cf8dce0ce55a30dfe5e7f9f49

SF: Update the sequence of operation for frame rate override

This change will freeze the timeline with the new rate generated
through the requestDisplayMode before updating the render rate for
frameRateOverride

BUG: 343603085
Test: atest libsurfaceflinger_unittest
Flag: com.android.graphics.surfaceflinger.flags.vrr_bugfix_dropped_frame
Change-Id: I4d1c8febe1203de11046f6b6f4a92dc5f29cfbb3

services/surfaceflinger/Scheduler/Scheduler.cpp

diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp
index 60681a2..4ce6cca 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.cpp
+++ b/services/surfaceflinger/Scheduler/Scheduler.cpp
@@ -1113,8 +1113,10 @@
                                                 .emitEvent = !choice.consideredSignals.idle});
         }
 
-        frameRateOverridesChanged = updateFrameRateOverridesLocked(consideredSignals, modeOpt->fps);
-
+        if (!FlagManager::getInstance().vrr_bugfix_dropped_frame()) {
+            frameRateOverridesChanged =
+                    updateFrameRateOverridesLocked(consideredSignals, modeOpt->fps);
+        }
         if (mPolicy.modeOpt != modeOpt) {
             mPolicy.modeOpt = modeOpt;
             refreshRateChanged = true;
@@ -1129,6 +1131,12 @@
     if (refreshRateChanged) {
         mSchedulerCallback.requestDisplayModes(std::move(modeRequests));
     }
+
+    if (FlagManager::getInstance().vrr_bugfix_dropped_frame()) {
+        std::scoped_lock lock(mPolicyLock);
+        frameRateOverridesChanged =
+                updateFrameRateOverridesLocked(consideredSignals, mPolicy.modeOpt->fps);
+    }
     if (frameRateOverridesChanged) {
         mSchedulerCallback.triggerOnFrameRateOverridesChanged();
     }