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

Commit 7faf212d authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge "SF: Add VsyncSchedule skeleton"

parents b72d34d4 068173d9

services/surfaceflinger/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -194,9 +194,10 @@ filegroup { 
        "Scheduler/Timer.cpp",

        "Scheduler/VSyncDispatchTimerQueue.cpp",

        "Scheduler/VSyncPredictor.cpp",

        "Scheduler/VsyncModulator.cpp",

        "Scheduler/VSyncReactor.cpp",

        "Scheduler/VsyncConfiguration.cpp",

        "Scheduler/VsyncModulator.cpp",

        "Scheduler/VsyncSchedule.cpp",

        "StartPropertySetThread.cpp",

        "SurfaceFlinger.cpp",

        "SurfaceFlingerDefaultFactory.cpp",

services/surfaceflinger/BufferQueueLayer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -372,8 +372,9 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) { 
    // Add this buffer from our internal queue tracker

    { // Autolock scope

        const nsecs_t presentTime = item.mIsAutoTimestamp ? 0 : item.mTimestamp;

        mFlinger->mScheduler->recordLayerHistory(this, presentTime,

                                                 LayerHistory::LayerUpdateType::Buffer);



        using LayerUpdateType = scheduler::LayerHistory::LayerUpdateType;

        mFlinger->mScheduler->recordLayerHistory(this, presentTime, LayerUpdateType::Buffer);



        Mutex::Autolock lock(mQueueItemLock);

        // Reset the frame number tracker when we receive the first buffer after

services/surfaceflinger/BufferStateLayer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -476,8 +476,9 @@ bool BufferStateLayer::setBuffer(const BufferData& bufferData, nsecs_t postTime, 


        return static_cast<nsecs_t>(0);

    }();

    mFlinger->mScheduler->recordLayerHistory(this, presentTime,

                                             LayerHistory::LayerUpdateType::Buffer);



    using LayerUpdateType = scheduler::LayerHistory::LayerUpdateType;

    mFlinger->mScheduler->recordLayerHistory(this, presentTime, LayerUpdateType::Buffer);



    addFrameEvent(mDrawingState.acquireFence, postTime, isAutoTimestamp ? 0 : desiredPresentTime);

services/surfaceflinger/DisplayDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ bool DisplayDevice::setDesiredActiveMode(const ActiveModeInfo& info) { 
    std::scoped_lock lock(mActiveModeLock);

    if (mDesiredActiveModeChanged) {

        // If a mode change is pending, just cache the latest request in mDesiredActiveMode

        const Scheduler::ModeEvent prevConfig = mDesiredActiveMode.event;

        const auto prevConfig = mDesiredActiveMode.event;

        mDesiredActiveMode = info;

        mDesiredActiveMode.event = mDesiredActiveMode.event | prevConfig;

        return false;
@@ -508,7 +508,7 @@ std::optional<DisplayDevice::ActiveModeInfo> DisplayDevice::getDesiredActiveMode 


void DisplayDevice::clearDesiredActiveModeState() {

    std::scoped_lock lock(mActiveModeLock);

    mDesiredActiveMode.event = Scheduler::ModeEvent::None;

    mDesiredActiveMode.event = scheduler::DisplayModeEvent::None;

    mDesiredActiveModeChanged = false;

}

services/surfaceflinger/DisplayDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public: 


    struct ActiveModeInfo {

        DisplayModePtr mode;

        scheduler::RefreshRateConfigEvent event = scheduler::RefreshRateConfigEvent::None;

        scheduler::DisplayModeEvent event = scheduler::DisplayModeEvent::None;



        bool operator!=(const ActiveModeInfo& other) const {

            return mode != other.mode || event != other.event;