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

Commit c7e11a68 authored by Matt Buckley's avatar Matt Buckley Committed by Automerger Merge Worker
Browse files

Merge "Reduce number of binders from SurfaceFlinger for ADPF" into udc-dev am: e2d95554 

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



Change-Id: Idfdeb06ec81d2f5975b859712c3f7f0c887b3de2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f9417d7 e2d95554

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void PowerAdvisor::updateTargetWorkDuration(Duration targetDuration) { 
}



void PowerAdvisor::reportActualWorkDuration() {

    if (!mBootFinished || !usePowerHintSession()) {

    if (!mBootFinished || !sUseReportActualDuration || !usePowerHintSession()) {

        ALOGV("Actual work duration power hint cannot be sent, skipping");

        return;

    }
@@ -564,6 +564,9 @@ const Duration PowerAdvisor::sTargetSafetyMargin = std::chrono::microseconds( 
        base::GetIntProperty<int64_t>("debug.sf.hint_margin_us",

                                      ticks<std::micro>(PowerAdvisor::kDefaultTargetSafetyMargin)));



const bool PowerAdvisor::sUseReportActualDuration =

        base::GetBoolProperty(std::string("debug.adpf.use_report_actual_duration"), true);



power::PowerHalController& PowerAdvisor::getPowerHal() {

    static std::once_flag halFlag;

    std::call_once(halFlag, [this] { mPowerHal->init(); });

services/surfaceflinger/DisplayHardware/PowerAdvisor.h

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ private: 
    static const Duration sTargetSafetyMargin;

    static constexpr const Duration kDefaultTargetSafetyMargin{1ms};



    // Whether we should send reportActualWorkDuration calls

    static const bool sUseReportActualDuration;



    // How long we expect hwc to run after the present call until it waits for the fence

    static constexpr const Duration kFenceWaitStartDelayValidated{150us};

    static constexpr const Duration kFenceWaitStartDelaySkippedValidate{250us};

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2485,7 +2485,10 @@ bool SurfaceFlinger::commit(TimePoint frameTime, VsyncId vsyncId, TimePoint expe 


        mPowerAdvisor->setFrameDelay(frameDelay);

        mPowerAdvisor->setTotalFrameTargetWorkDuration(idealSfWorkDuration);

        mPowerAdvisor->updateTargetWorkDuration(vsyncPeriod);



        const auto& display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked()).get();

        const Period idealVsyncPeriod = display->getActiveMode().fps.getPeriod();

        mPowerAdvisor->updateTargetWorkDuration(idealVsyncPeriod);

    }



    if (mRefreshRateOverlaySpinner) {