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

Commit 0188adf4 authored by Valerie Hau's avatar Valerie Hau
Browse files

Only process passback transactions during onFrameAvailable 

A callback will be fired from the rendering thread when drawFrame
returns after queueBuffer.  Since the client expects the transaction, if
sent, to be populated with the desired frame at this time, we need to
make that call to queueBuffer wait until the frame has actually been
processed and not put on the shadow queue

Step 1 in resolving screen freeze
Bug: 149315421
Test: build, boot, turn BLAST ON & reboot & phone boots fine

Change-Id: Ibef45fe6c7e0b57fdc4a1be61e2ac93fb2d33525
parent 90e9861f

libs/gui/BLASTBufferQueue.cpp

+9 −2
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
    }

    mPendingReleaseItem.item = std::move(mSubmitted.front());

    mSubmitted.pop();

    if (mNextTransaction == nullptr) {

        processNextBufferLocked();

    }

    mCallbackCV.notify_all();

    decStrong((void*)transactionCallbackThunk);

}
@@ -252,8 +254,13 @@ Rect BLASTBufferQueue::computeCrop(const BufferItem& item) { 


void BLASTBufferQueue::onFrameAvailable(const BufferItem& /*item*/) {

    ATRACE_CALL();

    std::lock_guard _lock{mMutex};

    std::unique_lock _lock{mMutex};



    if (mNextTransaction != nullptr) {

        while (mNumFrameAvailable > 0 || mNumAcquired == MAX_ACQUIRED_BUFFERS) {

            mCallbackCV.wait(_lock);

        }

    }

    // add to shadow queue

    mNumFrameAvailable++;

    processNextBufferLocked();