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

Commit 84252b5e authored by Robert Carr's avatar Robert Carr Committed by Automerger Merge Worker
Browse files

BlastBufferQueue: Fake release if not received by complete am: 405e2f68 am: cad6995e 

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



Change-Id: I0299fe379b0fad7031a67474409f78f78eff067a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1893c8d5 cad6995e

libs/gui/BLASTBufferQueue.cpp

+26 −2
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ void BLASTBufferQueue::transactionCommittedCallback(nsecs_t /*latchTime*/, 
            BQA_LOGE("No matching SurfaceControls found: mSurfaceControlsWithPendingCallback was "

                     "empty.");

        }



        decStrong((void*)transactionCommittedCallbackThunk);

    }

}
@@ -350,6 +349,20 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
                                                    stat.latchTime,

                                                    stat.frameEventStats.dequeueReadyTime);

                }

                auto currFrameNumber = stat.frameEventStats.frameNumber;

                std::vector<ReleaseCallbackId> staleReleases;

                for (const auto& [key, value]: mSubmitted) {

                    if (currFrameNumber > key.framenumber) {

                        staleReleases.push_back(key);

                    }

                }

                for (const auto& staleRelease : staleReleases) {

                    BQA_LOGE("Faking releaseBufferCallback from transactionCompleteCallback");

                    BBQ_TRACE("FakeReleaseCallback");

                    releaseBufferCallbackLocked(staleRelease,

                        stat.previousReleaseFence ? stat.previousReleaseFence : Fence::NO_FENCE,

                        stat.currentMaxAcquiredBufferCount);

                }

            } else {

                BQA_LOGE("Failed to find matching SurfaceControl in transactionCallback");

            }
@@ -390,7 +403,14 @@ void BLASTBufferQueue::releaseBufferCallback( 
        const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

        std::optional<uint32_t> currentMaxAcquiredBufferCount) {

    BBQ_TRACE();



    std::unique_lock _lock{mMutex};

    releaseBufferCallbackLocked(id, releaseFence, currentMaxAcquiredBufferCount);

}



void BLASTBufferQueue::releaseBufferCallbackLocked(const ReleaseCallbackId& id,

        const sp<Fence>& releaseFence, std::optional<uint32_t> currentMaxAcquiredBufferCount) {

    ATRACE_CALL();

    BQA_LOGV("releaseBufferCallback %s", id.to_string().c_str());



    // Calculate how many buffers we need to hold before we release them back
@@ -408,7 +428,11 @@ void BLASTBufferQueue::releaseBufferCallback( 


    const auto numPendingBuffersToHold =

            isEGL ? std::max(0u, mMaxAcquiredBuffers - mCurrentMaxAcquiredBufferCount) : 0;

    mPendingRelease.emplace_back(ReleasedBuffer{id, releaseFence});



    auto rb = ReleasedBuffer{id, releaseFence};

    if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) {

        mPendingRelease.emplace_back(rb);

    }



    // Release all buffers that are beyond the ones that we need to hold

    while (mPendingRelease.size() > numPendingBuffersToHold) {

libs/gui/SurfaceComposerClient.cpp

+4 −2
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener 
                                      transactionStats.latchTime, surfaceStats.acquireTimeOrFence,

                                      transactionStats.presentFence,

                                      surfaceStats.previousReleaseFence, surfaceStats.transformHint,

                                      surfaceStats.eventStats);

                                      surfaceStats.eventStats,

                                      surfaceStats.currentMaxAcquiredBufferCount);

            }



            callbackFunction(transactionStats.latchTime, transactionStats.presentFence,
@@ -382,7 +383,8 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener 
                                      transactionStats.latchTime, surfaceStats.acquireTimeOrFence,

                                      transactionStats.presentFence,

                                      surfaceStats.previousReleaseFence, surfaceStats.transformHint,

                                      surfaceStats.eventStats);

                                      surfaceStats.eventStats,

                                      surfaceStats.currentMaxAcquiredBufferCount);

                if (callbacksMap[callbackId].surfaceControls[surfaceStats.surfaceControl]) {

                    callbacksMap[callbackId]

                            .surfaceControls[surfaceStats.surfaceControl]

libs/gui/include/gui/BLASTBufferQueue.h

+9 −0
Original line number Diff line number Diff line
@@ -92,9 +92,12 @@ public: 
                                     const std::vector<SurfaceControlStats>& stats);

    void releaseBufferCallback(const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

                               std::optional<uint32_t> currentMaxAcquiredBufferCount);

    void releaseBufferCallbackLocked(const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

                               std::optional<uint32_t> currentMaxAcquiredBufferCount);

    void syncNextTransaction(std::function<void(SurfaceComposerClient::Transaction*)> callback,

                             bool acquireSingleBuffer = true);

    void stopContinuousSyncTransaction();



    void mergeWithNextTransaction(SurfaceComposerClient::Transaction* t, uint64_t frameNumber);

    void applyPendingTransactions(uint64_t frameNumber);

    SurfaceComposerClient::Transaction* gatherPendingTransactions(uint64_t frameNumber);
@@ -173,6 +176,12 @@ private: 
    struct ReleasedBuffer {

        ReleaseCallbackId callbackId;

        sp<Fence> releaseFence;

        bool operator==(const ReleasedBuffer& rhs) const {

            // Only compare Id so if we somehow got two callbacks

            // with different fences we don't decrement mNumAcquired

            // too far.

            return rhs.callbackId == callbackId;

        }

    };

    std::deque<ReleasedBuffer> mPendingRelease GUARDED_BY(mMutex);

libs/gui/include/gui/SurfaceComposerClient.h

+5 −2
Original line number Diff line number Diff line
@@ -69,14 +69,16 @@ struct SurfaceControlStats { 
    SurfaceControlStats(const sp<SurfaceControl>& sc, nsecs_t latchTime,

                        std::variant<nsecs_t, sp<Fence>> acquireTimeOrFence,

                        const sp<Fence>& presentFence, const sp<Fence>& prevReleaseFence,

                        uint32_t hint, FrameEventHistoryStats eventStats)

                        uint32_t hint, FrameEventHistoryStats eventStats,

                        uint32_t currentMaxAcquiredBufferCount)

          : surfaceControl(sc),

            latchTime(latchTime),

            acquireTimeOrFence(std::move(acquireTimeOrFence)),

            presentFence(presentFence),

            previousReleaseFence(prevReleaseFence),

            transformHint(hint),

            frameEventStats(eventStats) {}

            frameEventStats(eventStats),

            currentMaxAcquiredBufferCount(currentMaxAcquiredBufferCount) {}



    sp<SurfaceControl> surfaceControl;

    nsecs_t latchTime = -1;
@@ -85,6 +87,7 @@ struct SurfaceControlStats { 
    sp<Fence> previousReleaseFence;

    uint32_t transformHint = 0;

    FrameEventHistoryStats frameEventStats;

    uint32_t currentMaxAcquiredBufferCount = 0;

};



using TransactionCompletedCallbackTakesContext =

libs/gui/include/gui/test/CallbackUtils.h

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ private: 
        void verifySurfaceControlStats(const SurfaceControlStats& surfaceControlStats,

                                       nsecs_t latchTime) const {

            const auto& [surfaceControl, latch, acquireTimeOrFence, presentFence,

                         previousReleaseFence, transformHint, frameEvents] = surfaceControlStats;

                         previousReleaseFence, transformHint, frameEvents, ignore] =

                surfaceControlStats;



            ASSERT_TRUE(std::holds_alternative<nsecs_t>(acquireTimeOrFence));

            ASSERT_EQ(std::get<nsecs_t>(acquireTimeOrFence) > 0,