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

Commit 04d24da3 authored by Alec Mouri's avatar Alec Mouri
Browse files

Remove FenceTimelines 

These are unused, but show up in simpleperf traces as fence time
queries.

Bug: 231762515
Test: bouncy ball
Change-Id: Ib83141bdaab90f56e35fde3c259887391d253a5e
parent 8977ce95

services/surfaceflinger/SurfaceFlinger.cpp

+0 −5
Original line number Diff line number Diff line
@@ -2415,27 +2415,22 @@ void SurfaceFlinger::postComposition() { 


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



    getBE().mGlCompositionDoneTimeline.updateSignalTimes();

    std::shared_ptr<FenceTime> glCompositionDoneFenceTime;

    if (display && display->getCompositionDisplay()->getState().usesClientComposition) {

        glCompositionDoneFenceTime =

                std::make_shared<FenceTime>(display->getCompositionDisplay()

                                                    ->getRenderSurface()

                                                    ->getClientTargetAcquireFence());

        getBE().mGlCompositionDoneTimeline.push(glCompositionDoneFenceTime);

    } else {

        glCompositionDoneFenceTime = FenceTime::NO_FENCE;

    }



    getBE().mDisplayTimeline.updateSignalTimes();

    mPreviousPresentFences[1] = mPreviousPresentFences[0];

    mPreviousPresentFences[0].fence =

            display ? getHwComposer().getPresentFence(display->getPhysicalId()) : Fence::NO_FENCE;

    mPreviousPresentFences[0].fenceTime =

            std::make_shared<FenceTime>(mPreviousPresentFences[0].fence);



    getBE().mDisplayTimeline.push(mPreviousPresentFences[0].fenceTime);



    nsecs_t now = systemTime();



    // Set presentation information before calling Layer::releasePendingBuffer, such that jank

services/surfaceflinger/SurfaceFlinger.h

+0 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ enum class LatchUnsignaledConfig { 
using DisplayColorSetting = compositionengine::OutputColorSetting;



struct SurfaceFlingerBE {

    FenceTimeline mGlCompositionDoneTimeline;

    FenceTimeline mDisplayTimeline;



    // protected by mCompositorTimingLock;

    mutable std::mutex mCompositorTimingLock;

    CompositorTiming mCompositorTiming;