Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 444ea081 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "Ensure that expected present time is in the future" am: 2ea36520 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1557199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad6d4231954f01dd7ee39815f7c48c32b19b7b64
parents dccdd773 2ea36520

services/surfaceflinger/SurfaceFlinger.cpp

+9 −3
Original line number Diff line number Diff line
@@ -1725,8 +1725,14 @@ void SurfaceFlinger::onMessageInvalidate(nsecs_t expectedVSyncTime) { 
    // calculate the expected present time once and use the cached

    // value throughout this frame to make sure all layers are

    // seeing this same value.

    const nsecs_t lastExpectedPresentTime = mExpectedPresentTime.load();

    if (expectedVSyncTime >= frameStart) {

        mExpectedPresentTime = expectedVSyncTime;

    } else {

        mExpectedPresentTime = mScheduler->getDispSyncExpectedPresentTime(frameStart);

    }



    const nsecs_t lastScheduledPresentTime = mScheduledPresentTime;

    mScheduledPresentTime = expectedVSyncTime;



    // When Backpressure propagation is enabled we want to give a small grace period

    // for the present fence to fire instead of just giving up on this frame to handle cases
@@ -1756,7 +1762,7 @@ void SurfaceFlinger::onMessageInvalidate(nsecs_t expectedVSyncTime) { 
    const TracedOrdinal<bool> frameMissed = {"PrevFrameMissed",

                                             framePending ||

                                                     (previousPresentTime >= 0 &&

                                                      (lastExpectedPresentTime <

                                                      (lastScheduledPresentTime <

                                                       previousPresentTime - frameMissedSlop))};

    const TracedOrdinal<bool> hwcFrameMissed = {"PrevHwcFrameMissed",

                                                mHadDeviceComposition && frameMissed};

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -1199,6 +1199,7 @@ private: 
    std::unique_ptr<scheduler::RefreshRateStats> mRefreshRateStats;



    std::atomic<nsecs_t> mExpectedPresentTime = 0;

    nsecs_t mScheduledPresentTime = 0;

    hal::Vsync mHWCVsyncPendingState = hal::Vsync::DISABLE;



    /* ------------------------------------------------------------------------