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

Commit f115e508 authored by ramindani's avatar ramindani Committed by Ram Indani
Browse files

Update lastExpectedPresentTime when cadence changes 

When cadence changes, updating the
lastExpectedPresentTime prevents from
having an expected present time from a different cadence.

From getDeviceCompositionChanges we only store
the future expectedPresentTime.
getDeviceCompositionChanges follows after
onVsyncGenerated and stores the
expectedPresentTime otherwise from the past when rate changes.
This causes the next onVsyncGenerated to think
that the rate has changed, while it stayed the
same, and SF is flushing rest of the buffers
at the previous rate.

BUG: 296636253
BUG: 296635769
Test: manual
Change-Id: Ifb45d875e381a737b5e944d2e6cb080c5eb81196
parent 09acbb8c

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+8 −2
Original line number Diff line number Diff line
@@ -540,8 +540,9 @@ status_t HWComposer::getDeviceCompositionChanges( 
    displayData.validateWasSkipped = false;

    {

        std::scoped_lock lock{displayData.expectedPresentLock};

        if (expectedPresentTime > displayData.lastExpectedPresentTimestamp.ns()) {

            displayData.lastExpectedPresentTimestamp = TimePoint::fromNs(expectedPresentTime);

        // TODO(b/296636176) Update displayData.lastFrameInterval for present display commands

        }

    }



    if (canSkipValidate) {
@@ -965,6 +966,11 @@ status_t HWComposer::notifyExpectedPresentIfRequired(PhysicalDisplayId displayId 
                isExpectedPresentWithinTimeout(expectedPresentTime, lastExpectedPresentTimestamp,

                                               timeoutOpt, threshold);



        using fps_approx_ops::operator!=;

        if (frameIntervalIsOnCadence && frameInterval != lastFrameInterval) {

            displayData.lastExpectedPresentTimestamp = expectedPresentTime;

        }



        if (expectedPresentWithinTimeout && frameIntervalIsOnCadence) {

            return NO_ERROR;

        }