diff options
5 files changed, 7 insertions, 11 deletions
diff --git a/services/surfaceflinger/DisplayHardware/Hal.h b/services/surfaceflinger/DisplayHardware/Hal.h index 31c2833229..e3d962237b 100644 --- a/services/surfaceflinger/DisplayHardware/Hal.h +++ b/services/surfaceflinger/DisplayHardware/Hal.h @@ -169,10 +169,8 @@ inline std::string to_string( out << "}, "; out << "notifyExpectedPresentConfig={"; if (vrrConfig->notifyExpectedPresentConfig) { - out << "notifyExpectedPresentHeadsUpNs=" - << vrrConfig->notifyExpectedPresentConfig->notifyExpectedPresentHeadsUpNs - << ", notifyExpectedPresentTimeoutNs=" - << vrrConfig->notifyExpectedPresentConfig->notifyExpectedPresentTimeoutNs; + out << "headsUpNs=" << vrrConfig->notifyExpectedPresentConfig->headsUpNs + << ", timeoutNs=" << vrrConfig->notifyExpectedPresentConfig->timeoutNs; } out << "}}"; return out.str(); diff --git a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp index 33d36524ba..28e35de465 100644 --- a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp +++ b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp @@ -405,7 +405,7 @@ void VSyncPredictor::setDisplayModePtr(ftl::NonNull<DisplayModePtr> modePtr) { : std::nullopt; ALOGV("%s %s: DisplayMode %s notifyExpectedPresentTimeout %s", __func__, to_string(mId).c_str(), to_string(*modePtr).c_str(), - timeout ? std::to_string(timeout->notifyExpectedPresentTimeoutNs).c_str() : "N/A"); + timeout ? std::to_string(timeout->timeoutNs).c_str() : "N/A"); std::lock_guard lock(mMutex); mDisplayModePtr = modePtr; diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 138a9bb98a..b3692059e2 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -4133,7 +4133,7 @@ void SurfaceFlinger::onVsyncGenerated(TimePoint expectedPresentTime, const auto notifyExpectedPresentConfig = modePtr->getVrrConfig()->notifyExpectedPresentConfig; if (!notifyExpectedPresentConfig) return std::nullopt; - return Period::fromNs(notifyExpectedPresentConfig->notifyExpectedPresentTimeoutNs); + return Period::fromNs(notifyExpectedPresentConfig->timeoutNs); }(); notifyExpectedPresentIfRequired(modePtr->getPhysicalDisplayId(), vsyncPeriod, diff --git a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp index 6edecff6a6..8ad0b08635 100644 --- a/services/surfaceflinger/tests/unittests/HWComposerTest.cpp +++ b/services/surfaceflinger/tests/unittests/HWComposerTest.cpp @@ -330,10 +330,8 @@ TEST_F(HWComposerTest, getModesWithDisplayConfigurations_VRR_ON) { const hal::VrrConfig vrrConfig = hal::VrrConfig{.minFrameIntervalNs = static_cast<Fps>(120_Hz).getPeriodNsecs(), .notifyExpectedPresentConfig = hal::VrrConfig:: - NotifyExpectedPresentConfig{.notifyExpectedPresentHeadsUpNs = - ms2ns(30), - .notifyExpectedPresentTimeoutNs = - ms2ns(30)}}; + NotifyExpectedPresentConfig{.headsUpNs = ms2ns(30), + .timeoutNs = ms2ns(30)}}; hal::DisplayConfiguration displayConfiguration{.configId = kConfigId, .width = kWidth, .height = kHeight, diff --git a/services/surfaceflinger/tests/unittests/VSyncPredictorTest.cpp b/services/surfaceflinger/tests/unittests/VSyncPredictorTest.cpp index 9afaabeb1b..961ba578ca 100644 --- a/services/surfaceflinger/tests/unittests/VSyncPredictorTest.cpp +++ b/services/surfaceflinger/tests/unittests/VSyncPredictorTest.cpp @@ -662,7 +662,7 @@ TEST_F(VSyncPredictorTest, vsyncTrackerCallback) { const auto refreshRate = Fps::fromPeriodNsecs(mPeriod); NotifyExpectedPresentConfig notifyExpectedPresentConfig; - notifyExpectedPresentConfig.notifyExpectedPresentTimeoutNs = Period::fromNs(30).ns(); + notifyExpectedPresentConfig.timeoutNs = Period::fromNs(30).ns(); hal::VrrConfig vrrConfig; vrrConfig.notifyExpectedPresentConfig = notifyExpectedPresentConfig; |