commit c6e522e2af6734ac2f9f7d5d469583c5b0fff9f6
author ramindani <ramindani@google.com> Tue May 07 16:42:51 2024 -0700
committer Ying Wei <whisperwing@google.com> Fri May 24 04:04:21 2024 +0000
tree 71d0b4504fb015c96a0c1ae3ad5ba9ac499fd0bf
parent a48361eb933c2d5074e2ff72ff8d515d794738fe

[SF] Use Render rate for Refresh rate

When VRR device does not support refresh rate debug indicator callback
Use the render rate as the refresh rate on the indicator.

Test: Manually tested refresh rate indicator on device that supports the
callback and device that doesn't
BUG: 326137213

Change-Id: Ifd0d34909b831991d4525f2b5138e71e4a76c4d6

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 38cf053..a57e626 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -474,7 +474,6 @@
         features |= RefreshRateOverlay::Features::SetByHwc;
     }
 
-    // TODO(b/296636258) Update to use the render rate range in VRR mode.
     const auto fpsRange = mRefreshRateSelector->getSupportedRefreshRateRange();
     mRefreshRateOverlay = RefreshRateOverlay::create(fpsRange, features);
     if (mRefreshRateOverlay) {
@@ -489,6 +488,9 @@
     ATRACE_CALL();
     if (mRefreshRateOverlay) {
         if (!mRefreshRateOverlay->isSetByHwc() || setByHwc) {
+            if (mRefreshRateSelector->isVrrDevice() && !mRefreshRateOverlay->isSetByHwc()) {
+                refreshRate = renderFps;
+            }
             mRefreshRateOverlay->changeRefreshRate(refreshRate, renderFps);
         } else {
             mRefreshRateOverlay->changeRenderRate(renderFps);