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

Commit 1ab107f1 authored by Robert Carr's avatar Robert Carr Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: BlastBufferQueue: Fake release if not received by complete am: aca25f60 

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

Change-Id: I1f7c89dd810aafbacfb5a0e026a66648c6e696ff
parents fcf748db aca25f60

libs/gui/BLASTBufferQueue.cpp

+22 −2
Original line number Diff line number Diff line
@@ -350,6 +350,16 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
                    transactionCompleteCallback = std::move(mTransactionCompleteCallback);

                    mTransactionCompleteFrameNumber = 0;

                }

                std::vector<ReleaseCallbackId> staleReleases;

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

                    if (currFrameNumber > key.framenumber) {

                        staleReleases.push_back(key);

                    }

                }

                for (const auto& staleRelease : staleReleases) {

                    releaseBufferCallbackLocked(staleRelease, stat.previousReleaseFence ? stat.previousReleaseFence : Fence::NO_FENCE,

                                                stat.transformHint, stat.currentMaxAcquiredBufferCount);

                }

            } else {

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

            }
@@ -358,6 +368,7 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
                     "empty.");

        }





        decStrong((void*)transactionCallbackThunk);

    }
@@ -399,8 +410,14 @@ void BLASTBufferQueue::flushShadowQueue() { 
void BLASTBufferQueue::releaseBufferCallback(const ReleaseCallbackId& id,

                                             const sp<Fence>& releaseFence, uint32_t transformHint,

                                             uint32_t currentMaxAcquiredBufferCount) {

    ATRACE_CALL();

    std::unique_lock _lock{mMutex};

    releaseBufferCallbackLocked(id, releaseFence, transformHint, currentMaxAcquiredBufferCount);

}



void BLASTBufferQueue::releaseBufferCallbackLocked(const ReleaseCallbackId& id,

                                                   const sp<Fence>& releaseFence, uint32_t transformHint,

                                                   uint32_t currentMaxAcquiredBufferCount) {

    ATRACE_CALL();

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



    if (mSurfaceControl != nullptr) {
@@ -421,7 +438,10 @@ void BLASTBufferQueue::releaseBufferCallback(const ReleaseCallbackId& id, 


    const auto numPendingBuffersToHold =

            isEGL ? std::max(0u, mMaxAcquiredBuffers - currentMaxAcquiredBufferCount) : 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

+2 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener 
                                      transactionStats.latchTime, surfaceStats.acquireTime,

                                      transactionStats.presentFence,

                                      surfaceStats.previousReleaseFence, surfaceStats.transformHint,

                                      surfaceStats.eventStats);

                                      surfaceStats.eventStats, surfaceStats.currentMaxAcquiredBufferCount);

            }



            callbackFunction(transactionStats.latchTime, transactionStats.presentFence,
@@ -321,7 +321,7 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener 
                                      transactionStats.latchTime, surfaceStats.acquireTime,

                                      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

+8 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ public: 
            const std::vector<SurfaceControlStats>& stats);

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

                               uint32_t transformHint, uint32_t currentMaxAcquiredBufferCount);

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

                                     uint32_t transformHint, uint32_t currentMaxAcquiredBufferCount);

    void setNextTransaction(SurfaceComposerClient::Transaction *t);

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

    void setTransactionCompleteCallback(uint64_t frameNumber,
@@ -164,6 +166,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

+4 −2
Original line number Diff line number Diff line
@@ -57,14 +57,15 @@ class Region; 
struct SurfaceControlStats {

    SurfaceControlStats(const sp<SurfaceControl>& sc, nsecs_t latchTime, nsecs_t acquireTime,

                        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),

            acquireTime(acquireTime),

            presentFence(presentFence),

            previousReleaseFence(prevReleaseFence),

            transformHint(hint),

            frameEventStats(eventStats) {}

            frameEventStats(eventStats),

            currentMaxAcquiredBufferCount(currentMaxAcquiredBufferCount) {}



    sp<SurfaceControl> surfaceControl;

    nsecs_t latchTime = -1;
@@ -73,6 +74,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

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

                                       nsecs_t latchTime) const {

            const auto& [surfaceControl, latch, acquireTime, presentFence, previousReleaseFence,

                         transformHint, frameEvents] = surfaceControlStats;

                         transformHint, frameEvents, ignore] = surfaceControlStats;



            ASSERT_EQ(acquireTime > 0, mBufferResult == ExpectedResult::Buffer::ACQUIRED)

                    << "bad acquire time";