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

Commit 2a405b58 authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Prevent the refresh rate changed frequently when small dirty" into... 

Merge "Prevent the refresh rate changed frequently when small dirty" into udc-qpr-dev am: cb6209fc am: d646eff9

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



Change-Id: Ic942bfc48a1dfe86f4a10b270e9f1e05a20ce9e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbe4538e d646eff9

services/surfaceflinger/Scheduler/LayerInfo.cpp

+15 −2
Original line number Diff line number Diff line
@@ -116,12 +116,24 @@ LayerInfo::Frequent LayerInfo::isFrequent(nsecs_t now) const { 
        }

    }



    // Vote the small dirty when a layer contains at least HISTORY_SIZE of small dirty updates.

    bool isSmallDirty = false;

    if (smallDirtyCount >= kNumSmallDirtyThreshold) {

        if (mLastSmallDirtyCount >= HISTORY_SIZE) {

            isSmallDirty = true;

        } else {

            mLastSmallDirtyCount++;

        }

    } else {

        mLastSmallDirtyCount = 0;

    }



    if (isFrequent || isInfrequent) {

        // If the layer was previously inconclusive, we clear

        // the history as indeterminate layers changed to frequent,

        // and we should not look at the stale data.

        return {isFrequent, isFrequent && !mIsFrequencyConclusive, /* isConclusive */ true,

                /* isSmallDirty */ smallDirtyCount >= kNumSmallDirtyThreshold};

                isSmallDirty};

    }



    // If we can't determine whether the layer is frequent or not, we return
@@ -324,6 +336,7 @@ LayerInfo::RefreshRateVotes LayerInfo::getRefreshRateVote(const RefreshRateSelec 
        ATRACE_FORMAT_INSTANT("infrequent");

        ALOGV("%s is infrequent", mName.c_str());

        mLastRefreshRate.infrequent = true;

        mLastSmallDirtyCount = 0;

        // Infrequent layers vote for minimal refresh rate for

        // battery saving purposes and also to prevent b/135718869.

        votes.push_back({LayerHistory::LayerVoteType::Min, Fps()});
@@ -334,7 +347,7 @@ LayerInfo::RefreshRateVotes LayerInfo::getRefreshRateVote(const RefreshRateSelec 
        clearHistory(now);

    }



    // Return no vote if the latest frames are small dirty.

    // Return no vote if the recent frames are small dirty.

    if (frequent.isSmallDirty && !mLastRefreshRate.reported.isValid()) {

        ATRACE_FORMAT_INSTANT("NoVote (small dirty)");

        ALOGV("%s is small dirty", mName.c_str());

services/surfaceflinger/Scheduler/LayerInfo.h

+4 −0
Original line number Diff line number Diff line
@@ -357,6 +357,10 @@ private: 


    RefreshRateHistory mRefreshRateHistory;



    // This will be accessed from only one thread when counting a layer is frequent or infrequent,

    // and to determine whether a layer is in small dirty updating.

    mutable int32_t mLastSmallDirtyCount = 0;



    mutable std::unordered_map<LayerHistory::LayerVoteType, std::string> mTraceTags;



    // Shared for all LayerInfo instances

services/surfaceflinger/tests/unittests/LayerHistoryTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1124,8 +1124,8 @@ TEST_F(LayerHistoryTest, smallDirtyInMultiLayer) { 


    LayerHistory::Summary summary;



    // layer1 is active but infrequent.

    for (int i = 0; i < PRESENT_TIME_HISTORY_SIZE; i++) {

    // layer1 is updating small dirty.

    for (int i = 0; i < PRESENT_TIME_HISTORY_SIZE + FREQUENT_LAYER_WINDOW_SIZE + 1; i++) {

        auto props = layer1->getLayerProps();

        props.isSmallDirty = true;

        history().record(layer1->getSequence(), props, 0 /*presentTime*/, time,