commit 95a37e2f8dc8faca516b2828143476a4d4d09f06
author Ady Abraham <adyabr@google.com> Wed Jan 18 22:57:28 2023 -0800
committer Ady Abraham <adyabr@google.com> Thu Jan 19 13:13:23 2023 -0800
tree 0eb75b6ece5420970ea27f741bef5a2cdce72496
parent 80a71b067ce134c8099ddea9d139c5e336f358f2

SF: change the render frame rate when a display mode is changing

Set the render frame rate to the physical display refresh rate so
we could schedule the frame that initiates the mode switch quicker.

Test: atest open-fixed-calculator --rebuild-module-info --tf-template metric_post_processor=google/template/postprocessors/metric-file-aggregate.xml --aggregate-metric-filter source_event_delay_millis_com.google.android.calculator-mean
Bug: 264964129
Change-Id: Ib25ac71837d73284e7b4b4c89d98f412922693b3

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 0982077..2b6a519 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -479,8 +479,9 @@
     const auto& desiredMode = *info.modeOpt->modePtr;
 
     // Check if we are already at the desired mode
-    if (!force && refreshRateSelector().getActiveMode().modePtr->getId() == desiredMode.getId()) {
-        if (refreshRateSelector().getActiveMode() == info.modeOpt) {
+    const auto currentMode = refreshRateSelector().getActiveMode();
+    if (!force && currentMode.modePtr->getId() == desiredMode.getId()) {
+        if (currentMode == info.modeOpt) {
             return DesiredActiveModeAction::None;
         }
 
@@ -488,6 +489,11 @@
         return DesiredActiveModeAction::InitiateRenderRateSwitch;
     }
 
+    // Set the render frame rate to the current physical refresh rate to schedule the next
+    // frame as soon as possible.
+    setActiveMode(currentMode.modePtr->getId(), currentMode.modePtr->getFps(),
+                  currentMode.modePtr->getFps());
+
     // Initiate a mode change.
     mDesiredActiveModeChanged = true;
     mDesiredActiveMode = info;