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

Commit 05da008e authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceFlinger: Correct logic error in early release 

Client composition early release logic should function roughly
like this:
	1. Set client composition fence on layer if it's client
	composed
	2. If we process setBuffer when we have the fence, release the
	   previous buffer with the client composition fence
	3. If we display the layer a second time we clear the client
	   composition fence.
The current implementation doesn't really accomplish this. Since
onLayerDisplayed comes after setting the client composition fence, we
need to track "the second onLayerDisplayed after onPostComposition".
Unfortunately when adding the onPostComposition logic I seem to have
not thought carefully enough about this, likely because I was too
focused on the multi-display issue going on in the previous bug. This
logic should also work to solve that bug.

Bug: 231290210
Test: Existing tests pass
Change-Id: I0fbf3cf3e2b39410fdac3bc0db905a4d088aba58
parent a0292d14

services/surfaceflinger/BufferLayer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -358,8 +358,6 @@ void BufferLayer::onPostComposition(const DisplayDevice* display, 
    // composition.

    if (!mBufferInfo.mFrameLatencyNeeded) return;



    mAlreadyDisplayedThisCompose = false;



    // Update mFrameEventHistory.

    finalizeFrameEventHistory(glDoneFence, compositorTiming);

services/surfaceflinger/BufferStateLayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ void BufferStateLayer::onLayerDisplayed(ftl::SharedFuture<FenceResult> futureFen 
    //  For example we can only use it if all the displays are client comp, and we need

    //  to merge all the client comp fences. We could do this, but for now we just

    // disable the optimization when a layer is composed on multiple displays.

    if (mAlreadyDisplayedThisCompose) {

    if (mClearClientCompositionFenceOnLayerDisplayed) {

        mLastClientCompositionFence = nullptr;

    } else {

        mAlreadyDisplayedThisCompose = true;

        mClearClientCompositionFenceOnLayerDisplayed = true;

    }



    // The previous release fence notifies the client that SurfaceFlinger is done with the previous

services/surfaceflinger/CompositionEngine/src/Output.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1300,6 +1300,7 @@ std::vector<LayerFE::LayerSettings> Output::generateClientCompositionRequests( 
        const auto& layerState = layer->getState();

        const auto* layerFEState = layer->getLayerFE().getCompositionState();

        auto& layerFE = layer->getLayerFE();

        layerFE.setWasClientComposed(nullptr);



        const Region clip(viewportRegion.intersect(layerState.visibleRegion));

        ALOGV("Layer: %s", layerFE.getDebugName());

services/surfaceflinger/Layer.h

+2 −1
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ public: 


    void setWasClientComposed(const sp<Fence>& fence) override {

        mLastClientCompositionFence = fence;

        mClearClientCompositionFenceOnLayerDisplayed = false;

    }



    const char* getDebugName() const override;
@@ -1035,7 +1036,7 @@ protected: 
    mutable bool mDrawingStateModified = false;



    sp<Fence> mLastClientCompositionFence;

    bool mAlreadyDisplayedThisCompose = false;

    bool mClearClientCompositionFenceOnLayerDisplayed = false;

private:

    virtual void setTransformHint(ui::Transform::RotationFlags) {}