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

Commit bc2f0203 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "[sf] update latch time only for layers that will not be latched" into udc-dev am: b7e106b1 

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



Change-Id: I83d120b8a80f315e18c9f9322b2929a87d36e98b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb57c840 b7e106b1

services/surfaceflinger/Layer.cpp

+8 −5
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ void Layer::transferAvailableJankData(const std::deque<sp<CallbackHandle>>& hand 
// transaction

// ----------------------------------------------------------------------------



uint32_t Layer::doTransaction(uint32_t flags, nsecs_t latchTime) {

uint32_t Layer::doTransaction(uint32_t flags) {

    ATRACE_CALL();



    // TODO: This is unfortunate.
@@ -818,12 +818,12 @@ uint32_t Layer::doTransaction(uint32_t flags, nsecs_t latchTime) { 
        mFlinger->mUpdateInputInfo = true;

    }



    commitTransaction(mDrawingState, latchTime);

    commitTransaction(mDrawingState);



    return flags;

}



void Layer::commitTransaction(State&, nsecs_t currentLatchTime) {

void Layer::commitTransaction(State&) {

    // Set the present state for all bufferlessSurfaceFramesTX to Presented. The

    // bufferSurfaceFrameTX will be presented in latchBuffer.

    for (auto& [token, surfaceFrame] : mDrawingState.bufferlessSurfaceFramesTX) {
@@ -835,7 +835,6 @@ void Layer::commitTransaction(State&, nsecs_t currentLatchTime) { 
        }

    }

    mDrawingState.bufferlessSurfaceFramesTX.clear();

    mLastLatchTime = currentLatchTime;

}



uint32_t Layer::clearTransactionFlags(uint32_t mask) {
@@ -1381,7 +1380,7 @@ void Layer::addSurfaceFramePresentedForBuffer( 
    surfaceFrame->setAcquireFenceTime(acquireFenceTime);

    surfaceFrame->setPresentState(PresentState::Presented, mLastLatchTime);

    mFlinger->mFrameTimeline->addSurfaceFrame(surfaceFrame);

    mLastLatchTime = currentLatchTime;

    updateLastLatchTime(currentLatchTime);

}



std::shared_ptr<frametimeline::SurfaceFrame> Layer::createSurfaceFrameForTransaction(
@@ -4077,6 +4076,10 @@ void Layer::setTrustedPresentationInfo(TrustedPresentationThresholds const& thre 
    }

}



void Layer::updateLastLatchTime(nsecs_t latchTime) {

    mLastLatchTime = latchTime;

}



// ---------------------------------------------------------------------------



std::ostream& operator<<(std::ostream& stream, const Layer::FrameRate& rate) {

services/surfaceflinger/Layer.h

+3 −2
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ public: 
    void useSurfaceDamage();

    void useEmptyDamage();

    Region getVisibleRegion(const DisplayDevice*) const;

    void updateLastLatchTime(nsecs_t latchtime);



    /*

     * isOpaque - true if this surface is opaque
@@ -623,7 +624,7 @@ public: 
     * doTransaction - process the transaction. This is a good place to figure

     * out which attributes of the surface have changed.

     */

    virtual uint32_t doTransaction(uint32_t transactionFlags, nsecs_t currentLatchTime);

    virtual uint32_t doTransaction(uint32_t transactionFlags);



    /*

     * Remove relative z for the layer if its relative parent is not part of the
@@ -860,7 +861,7 @@ protected: 
    void preparePerFrameCompositionState();

    void preparePerFrameBufferCompositionState();

    void preparePerFrameEffectsCompositionState();

    virtual void commitTransaction(State& stateToCommit, nsecs_t currentLatchTime = 0);

    virtual void commitTransaction(State& stateToCommit);

    void gatherBufferInfo();

    void onSurfaceFrameCreated(const std::shared_ptr<frametimeline::SurfaceFrame>&);

services/surfaceflinger/SurfaceFlinger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -3863,7 +3863,7 @@ void SurfaceFlinger::commitOffscreenLayers() { 
    for (Layer* offscreenLayer : mOffscreenLayers) {

        offscreenLayer->traverse(LayerVector::StateSet::Drawing, [](Layer* layer) {

            if (layer->clearTransactionFlags(eTransactionNeeded)) {

                layer->doTransaction(0, 0);

                layer->doTransaction(0);

                layer->commitChildList();

            }

        });
@@ -3899,7 +3899,7 @@ bool SurfaceFlinger::latchBuffers() { 
    // second frame. But layer 0's second frame could be waiting on display.

    mDrawingState.traverse([&](Layer* layer) {

        if (layer->clearTransactionFlags(eTransactionNeeded) || mForceTransactionDisplayChange) {

            const uint32_t flags = layer->doTransaction(0, latchTime);

            const uint32_t flags = layer->doTransaction(0);

            if (flags & Layer::eVisibleRegion) {

                mVisibleRegionsDirty = true;

            }
@@ -3910,6 +3910,8 @@ bool SurfaceFlinger::latchBuffers() { 
            mLayersWithQueuedFrames.emplace(sp<Layer>::fromExisting(layer));

        } else {

            layer->useEmptyDamage();

            // If the layer has frames we will update the latch time when latching the buffer.

            layer->updateLastLatchTime(latchTime);

        }

    });

    mForceTransactionDisplayChange = false;