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

Commit bcd605bf authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Disable normalization for power hint by default" into tm-dev am: af5fa6bf 

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

Change-Id: I9a44a95f09f5686aa1eb60ad68cd479d4fce3f5b
parents 1a79fa43 af5fa6bf

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ private: 
    static constexpr double kAllowedTargetDeviationPercent = 0.05;

    // Target used for init and normalization, the actual value does not really matter

    static constexpr const std::chrono::nanoseconds kDefaultTarget = 50ms;

    // amount of time after the last message was sent before the session goes stale

    // Amount of time after the last message was sent before the session goes stale

    // actually 100ms but we use 80 here to ideally avoid going stale

    static constexpr const std::chrono::nanoseconds kStaleTimeout = 80ms;

};
@@ -551,7 +551,7 @@ const bool AidlPowerHalWrapper::sTraceHintSessionData = 
        base::GetBoolProperty(std::string("debug.sf.trace_hint_sessions"), false);



const bool AidlPowerHalWrapper::sNormalizeTarget =

        base::GetBoolProperty(std::string("debug.sf.normalize_hint_session_durations"), true);

        base::GetBoolProperty(std::string("debug.sf.normalize_hint_session_durations"), false);



PowerAdvisor::HalWrapper* PowerAdvisor::getPowerHal() {

    static std::unique_ptr<HalWrapper> sHalWrapper = nullptr;

services/surfaceflinger/SurfaceFlinger.cpp

+11 −11
Original line number Diff line number Diff line
@@ -721,15 +721,15 @@ void SurfaceFlinger::bootFinished() { 
        }



        readPersistentProperties();

        mPowerAdvisor.onBootFinished();

        mPowerAdvisor.enablePowerHint(mFlagManager->use_adpf_cpu_hint());

        if (mPowerAdvisor.usePowerHintSession()) {

            std::optional<pid_t> renderEngineTid = getRenderEngine().getRenderEngineTid();

            std::vector<int32_t> tidList;

            tidList.emplace_back(gettid());

            if (renderEngineTid.has_value()) {

                tidList.emplace_back(*renderEngineTid);

            }

        mPowerAdvisor.onBootFinished();

        mPowerAdvisor.enablePowerHint(mFlagManager->use_adpf_cpu_hint());

        if (mPowerAdvisor.usePowerHintSession()) {

            mPowerAdvisor.startPowerHintSession(tidList);

        }
@@ -3729,8 +3729,8 @@ int SurfaceFlinger::flushPendingTransactionQueues( 
                break;

            }

            transaction.traverseStatesWithBuffers([&](const layer_state_t& state) {

                const bool frameNumberChanged = 

                    state.bufferData->flags.test(BufferData::BufferDataChange::frameNumberChanged);

                const bool frameNumberChanged = state.bufferData->flags.test(

                        BufferData::BufferDataChange::frameNumberChanged);

                if (frameNumberChanged) {

                    bufferLayersReadyToPresent[state.surface] = state.bufferData->frameNumber;

                } else {
@@ -3810,8 +3810,8 @@ bool SurfaceFlinger::flushTransactionQueues(int64_t vsyncId) { 
                    mPendingTransactionQueues[transaction.applyToken].push(std::move(transaction));

                } else {

                    transaction.traverseStatesWithBuffers([&](const layer_state_t& state) {

                        const bool frameNumberChanged = 

                            state.bufferData->flags.test(BufferData::BufferDataChange::frameNumberChanged);

                        const bool frameNumberChanged = state.bufferData->flags.test(

                                BufferData::BufferDataChange::frameNumberChanged);

                        if (frameNumberChanged) {

                            bufferLayersReadyToPresent[state.surface] = state.bufferData->frameNumber;

                        } else {