summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Prod User <android-build-prod@system.gserviceaccount.com>2023-03-17 13:57:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-17 13:57:12 +0000
commitf675ac1d988e0b858785931a7db094209046e78d (patch)
tree67079cd245a9469bf5fed6656ca16bdd06d2767b
parent413f79aa2b18f8989146a903d34701d2c6d0b5ee (diff)
parentf3a4fe644b5c160e2b091316e7d9ec597f8c16f6 (diff)
Merge "sf: update work durations before accessing the vsync config set" into t-keystone-qcom-dev
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index af25be9fa2..871f06a1c3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4256,7 +4256,6 @@ void SurfaceFlinger::processDisplayChanged(const wp<IBinder>& displayToken,
void SurfaceFlinger::updateInternalDisplayVsyncLocked(const sp<DisplayDevice>& activeDisplay) {
mVsyncConfiguration->reset();
const Fps refreshRate = activeDisplay->refreshRateConfigs().getActiveMode()->getFps();
- updatePhaseConfiguration(refreshRate);
mRefreshRateStats->setRefreshRate(refreshRate);
if (mUseAdvanceSfOffset && mComposerExtnIntf) {
const auto& supportedModes = getDefaultDisplayDeviceLocked()->getSupportedModes();
@@ -4277,6 +4276,7 @@ void SurfaceFlinger::updateInternalDisplayVsyncLocked(const sp<DisplayDevice>& a
mVsyncConfiguration->UpdateSfOffsets(&mAdvancedSfOffsets);
}
}
+ updatePhaseConfiguration(refreshRate);
}
void SurfaceFlinger::setFrameBufferSizeForScaling(sp<DisplayDevice> displayDevice,