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

Commit ecd8ac0c authored by Su Hong Koo's avatar Su Hong Koo Committed by Android (Google) Code Review
Browse files

Merge changes I4417c415,I739e4e5b into main 

* changes:
  Flag: Trunk-stable flag for migrating pacesetter to display with highest refresh rate
  SF: plumb PhysicalDisplayId to kernelIdleTimerCallback and vrrDisplayIdle
parents 2fabbc07 b70835d1

services/surfaceflinger/Scheduler/ISchedulerCallback.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct ISchedulerCallback { 
    virtual void onExpectedPresentTimePosted(TimePoint, ftl::NonNull<DisplayModePtr>,

                                             Fps renderRate) = 0;

    virtual void onCommitNotComposited() = 0;

    virtual void vrrDisplayIdle(bool idle) = 0;

    virtual void vrrDisplayIdle(PhysicalDisplayId, bool idle) = 0;



protected:

    ~ISchedulerCallback() = default;

services/surfaceflinger/Scheduler/Scheduler.cpp

+32 −8
Original line number Diff line number Diff line
@@ -843,12 +843,23 @@ auto Scheduler::getVsyncScheduleLocked(std::optional<PhysicalDisplayId> idOpt) c 
    return displayOpt->get().schedulePtr;

}



void Scheduler::kernelIdleTimerCallback(TimerState state) {

void Scheduler::kernelIdleTimerCallback(PhysicalDisplayId displayId, TimerState state) {

    SFTRACE_INT("ExpiredKernelIdleTimer", static_cast<int>(state));



    // TODO(145561154): cleanup the kernel idle timer implementation and the refresh rate

    Fps refreshRate;

    {

        std::scoped_lock lock(mDisplayLock);

        ftl::FakeGuard guard(kMainThreadContext);

        const auto displayOpt = mDisplays.get(displayId);

        if (!displayOpt) {

            ALOGW("%s: Invalid display %s!", __func__, to_string(displayId).c_str());

            return;

        }



        // TODO: b/145561154 - Clean up the kernel idle timer implementation and the refresh rate

        // magic number

    const Fps refreshRate = pacesetterSelectorPtr()->getActiveMode().modePtr->getPeakFps();

        refreshRate = displayOpt->get().selectorPtr->getActiveMode().modePtr->getPeakFps();

    }



    constexpr Fps FPS_THRESHOLD_FOR_KERNEL_TIMER = 65_Hz;

    using namespace fps_approx_ops;
@@ -1013,11 +1024,24 @@ std::shared_ptr<VsyncSchedule> Scheduler::promotePacesetterDisplayLocked( 
            pacesetter.selectorPtr->setIdleTimerCallbacks(

                    {.platform = {.onReset = [this] { idleTimerCallback(TimerState::Reset); },

                                  .onExpired = [this] { idleTimerCallback(TimerState::Expired); }},

                     .kernel = {.onReset = [this] { kernelIdleTimerCallback(TimerState::Reset); },

                     .kernel = {.onReset =

                                        [this, pacesetterId] {

                                            kernelIdleTimerCallback(pacesetterId,

                                                                    TimerState::Reset);

                                        },

                                .onExpired =

                                        [this, pacesetterId] {

                                            kernelIdleTimerCallback(pacesetterId,

                                                                    TimerState::Expired);

                                        }},

                     .vrr = {.onReset =

                                     [this, pacesetterId] {

                                         mSchedulerCallback.vrrDisplayIdle(pacesetterId, false);

                                     },

                             .onExpired =

                                        [this] { kernelIdleTimerCallback(TimerState::Expired); }},

                     .vrr = {.onReset = [this] { mSchedulerCallback.vrrDisplayIdle(false); },

                             .onExpired = [this] { mSchedulerCallback.vrrDisplayIdle(true); }}});

                                     [this, pacesetterId] {

                                         mSchedulerCallback.vrrDisplayIdle(pacesetterId, true);

                                     }}});



            pacesetter.selectorPtr->startIdleTimer();

        }

services/surfaceflinger/Scheduler/Scheduler.h

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ private: 
    }



    // Update feature state machine to given state when corresponding timer resets or expires.

    void kernelIdleTimerCallback(TimerState) EXCLUDES(mDisplayLock);

    void kernelIdleTimerCallback(PhysicalDisplayId, TimerState) EXCLUDES(mDisplayLock);

    void idleTimerCallback(TimerState);

    void touchTimerCallback(TimerState);

    void displayPowerTimerCallback(TimerState);

services/surfaceflinger/SurfaceFlinger.cpp

+6 −9
Original line number Diff line number Diff line
@@ -7271,19 +7271,16 @@ void SurfaceFlinger::kernelTimerChanged(bool expired) { 
    }));

}



void SurfaceFlinger::vrrDisplayIdle(bool idle) {

void SurfaceFlinger::vrrDisplayIdle(PhysicalDisplayId displayId, bool idle) {

    // Update the overlay on the main thread to avoid race conditions with

    // RefreshRateSelector::getActiveMode

    static_cast<void>(mScheduler->schedule([=, this] {

        const auto display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked());

        if (!display) {

            ALOGW("%s: default display is null", __func__);

            return;

        }

        if (!display->isRefreshRateOverlayEnabled()) return;



        if (const auto display = FTL_FAKE_GUARD(mStateLock, getDisplayDeviceLocked(displayId))) {

            if (display->isRefreshRateOverlayEnabled()) {

                display->onVrrIdle(idle);

                mScheduler->scheduleFrame();

            }

        }

    }));

}

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ private: 
                                     Fps renderRate) override;

    void onCommitNotComposited() override

            REQUIRES(kMainThreadContext);

    void vrrDisplayIdle(bool idle) override;

    void vrrDisplayIdle(PhysicalDisplayId displayId, bool idle) override;



    // ICEPowerCallback overrides:

    void notifyCpuLoadUp() override;