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

Commit 205c6dda authored by Theodore Dubois's avatar Theodore Dubois
Browse files

Improve handling of hwcomposer with unsupported present fences 

An implementation such as HWC2OnFbAdapter always returns -1 for the
present fence. FrameTimeline should not ignore invalid fences in
mPendingPresentFences, since in this case every fence is invalid,
resulting in resource leaks. Similarly, PresentLatencyTracker should not
be used if HWC doesn't support present fences.

Test: no logspam running on starnix (fuchsia), which uses framebuffer
Test: booted emulator, no behavior change
Test: booted panther, no behavior change
Change-Id: I4a11edc443a1cd3a395fc8f97b93a5474d11fe31
parent 95538a1c

services/surfaceflinger/FrameTimeline/FrameTimeline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ float FrameTimeline::computeFps(const std::unordered_set<int32_t>& layerIds) { 
std::optional<size_t> FrameTimeline::getFirstSignalFenceIndex() const {

    for (size_t i = 0; i < mPendingPresentFences.size(); i++) {

        const auto& [fence, _] = mPendingPresentFences[i];

        if (fence && fence->isValid() && fence->getSignalTime() != Fence::SIGNAL_TIME_PENDING) {

        if (fence && fence->getSignalTime() != Fence::SIGNAL_TIME_PENDING) {

            return i;

        }

    }

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2430,7 +2430,9 @@ void SurfaceFlinger::postComposition() { 
    const TimePoint compositeTime =

            TimePoint::fromNs(mCompositionEngine->getLastFrameRefreshTimestamp());

    const Duration presentLatency =

            mPresentLatencyTracker.trackPendingFrame(compositeTime, presentFenceTime);

            !getHwComposer().hasCapability(Capability::PRESENT_FENCE_IS_NOT_RELIABLE)

            ? mPresentLatencyTracker.trackPendingFrame(compositeTime, presentFenceTime)

            : Duration::zero();



    const auto& schedule = mScheduler->getVsyncSchedule();

    const TimePoint vsyncDeadline = schedule.vsyncDeadlineAfter(presentTime);