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

Commit ce6bde8d authored by Matthew DeVore's avatar Matthew DeVore Committed by Android (Google) Code Review
Browse files

Revert "[legacy sf flag] - Remove legacyFrontEndEnabled" 

This reverts commit 11e197a2.

Reason for revert: caused regression in arc.PlayStore.betty_vm see http://b/337352234

Change-Id: I9ba883f0190b82ac1e00ed47ace8bec4e8a46fa6
parent 11e197a2

services/surfaceflinger/Layer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -3218,6 +3218,10 @@ bool Layer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>& buffer, 
    mFlinger->mTimeStats->setPostTime(layerId, mDrawingState.frameNumber, getName().c_str(),

                                      mOwnerUid, postTime, getGameMode());



    if (mFlinger->mLegacyFrontEndEnabled) {

        recordLayerHistoryBufferUpdate(getLayerProps(), systemTime());

    }



    setFrameTimelineVsyncForBufferTransaction(info, postTime);



    if (dequeueTime && *dequeueTime != 0) {

services/surfaceflinger/SurfaceFlinger.cpp

+114 −76
Original line number Diff line number Diff line
@@ -531,6 +531,8 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 


    mLayerLifecycleManagerEnabled =

            base::GetBoolProperty("persist.debug.sf.enable_layer_lifecycle_manager"s, true);

    mLegacyFrontEndEnabled = !mLayerLifecycleManagerEnabled ||

            base::GetBoolProperty("persist.debug.sf.enable_legacy_frontend"s, false);



    // These are set by the HWC implementation to indicate that they will use the workarounds.

    mIsHotplugErrViaNegVsync =
@@ -2438,6 +2440,7 @@ bool SurfaceFlinger::updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs, 
    mustComposite |= mLayerLifecycleManager.getGlobalChanges().get() != 0;



    bool newDataLatched = false;

    if (!mLegacyFrontEndEnabled) {

        ATRACE_NAME("DisplayCallbackAndStatsUpdates");

        mustComposite |= applyTransactionsLocked(update.transactions, vsyncId);

        traverseLegacyLayers([&](Layer* layer) { layer->commitTransaction(); });
@@ -2492,7 +2495,8 @@ bool SurfaceFlinger::updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs, 


        updateLayerHistory(latchTime);

        mLayerSnapshotBuilder.forEachVisibleSnapshot([&](const frontend::LayerSnapshot& snapshot) {

        if (mLayersIdsWithQueuedFrames.find(snapshot.path.id) == mLayersIdsWithQueuedFrames.end())

            if (mLayersIdsWithQueuedFrames.find(snapshot.path.id) ==

                mLayersIdsWithQueuedFrames.end())

                return;

            Region visibleReg;

            visibleReg.set(snapshot.transformedBoundsWithoutTransparentRegion);
@@ -2513,9 +2517,9 @@ bool SurfaceFlinger::updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs, 
            ALOGI("Enter boot animation");

            mBootStage = BootStage::BOOTANIMATION;

        }



    }

    mustComposite |= (getTransactionFlags() & ~eTransactionFlushNeeded) || newDataLatched;

    if (mustComposite) {

    if (mustComposite && !mLegacyFrontEndEnabled) {

        commitTransactions();

    }
@@ -2617,7 +2621,12 @@ bool SurfaceFlinger::commit(PhysicalDisplayId pacesetterId, 
                                    mScheduler->getPacesetterRefreshRate());



        const bool flushTransactions = clearTransactionFlags(eTransactionFlushNeeded);

        bool transactionsAreEmpty = false;

        bool transactionsAreEmpty;

        if (mLegacyFrontEndEnabled) {

            mustComposite |=

                    updateLayerSnapshotsLegacy(vsyncId, pacesetterFrameTarget.frameBeginTime().ns(),

                                               flushTransactions, transactionsAreEmpty);

        }

        if (mLayerLifecycleManagerEnabled) {

            mustComposite |=

                    updateLayerSnapshots(vsyncId, pacesetterFrameTarget.frameBeginTime().ns(),
@@ -5241,9 +5250,16 @@ bool SurfaceFlinger::applyTransactionState(const FrameTimelineInfo& frameTimelin 
    nsecs_t now = systemTime();

    uint32_t clientStateFlags = 0;

    for (auto& resolvedState : states) {

        if (mLegacyFrontEndEnabled) {

            clientStateFlags |=

                updateLayerCallbacksAndStats(frameTimelineInfo, resolvedState, desiredPresentTime,

                    setClientStateLocked(frameTimelineInfo, resolvedState, desiredPresentTime,

                                         isAutoTimestamp, postTime, transactionId);



        } else /*mLayerLifecycleManagerEnabled*/ {

            clientStateFlags |= updateLayerCallbacksAndStats(frameTimelineInfo, resolvedState,

                                                             desiredPresentTime, isAutoTimestamp,

                                                             postTime, transactionId);

        }

        if (!mLayerLifecycleManagerEnabled) {

            if ((flags & eAnimation) && resolvedState.state.surface) {

                if (const auto layer = LayerHandle::getLayer(resolvedState.state.surface)) {
@@ -5315,7 +5331,7 @@ bool SurfaceFlinger::applyAndCommitDisplayTransactionStatesLocked( 
    }



    mFrontEndDisplayInfosChanged = mTransactionFlags & eDisplayTransactionNeeded;

    if (mFrontEndDisplayInfosChanged) {

    if (mFrontEndDisplayInfosChanged && !mLegacyFrontEndEnabled) {

        processDisplayChangesLocked();

        mFrontEndDisplayInfos.clear();

        for (const auto& [_, display] : mDisplays) {
@@ -5958,6 +5974,11 @@ status_t SurfaceFlinger::mirrorDisplay(DisplayId displayId, const LayerCreationA 
        return result;

    }



    if (mLegacyFrontEndEnabled) {

        std::scoped_lock<std::mutex> lock(mMirrorDisplayLock);

        mMirrorDisplays.emplace_back(layerStack, outResult.handle, args.client);

    }



    setTransactionFlags(eTransactionFlushNeeded);

    return NO_ERROR;

}
@@ -6072,7 +6093,9 @@ void SurfaceFlinger::initializeDisplays() { 
    std::vector<TransactionState> transactions;

    transactions.emplace_back(state);



    {

    if (mLegacyFrontEndEnabled) {

        applyTransactions(transactions, VsyncId{0});

    } else {

        Mutex::Autolock lock(mStateLock);

        applyAndCommitDisplayTransactionStatesLocked(transactions);

    }
@@ -6624,6 +6647,17 @@ perfetto::protos::LayersProto SurfaceFlinger::dumpDrawingStateProto(uint32_t tra 
        }

    }



    if (mLegacyFrontEndEnabled) {

        perfetto::protos::LayersProto layersProto;

        for (const sp<Layer>& layer : mDrawingState.layersSortedByZ) {

            if (stackIdsToSkip.find(layer->getLayerStack().id) != stackIdsToSkip.end()) {

                continue;

            }

            layer->writeToProto(layersProto, traceFlags);

        }

        return layersProto;

    }



    return LayerProtoFromSnapshotGenerator(mLayerSnapshotBuilder, mFrontEndDisplayInfos,

                                           mLegacyLayers, traceFlags)

            .generate(mLayerHierarchyBuilder.getHierarchy());
@@ -6873,6 +6907,10 @@ void SurfaceFlinger::dumpAll(const DumpArgs& args, const std::string& compositio 
    }

    result.push_back('\n');



    if (mLegacyFrontEndEnabled) {

        dumpHwcLayersMinidumpLockedLegacy(result);

    }



    {

        DumpArgs plannerArgs;

        plannerArgs.add(); // first argument is ignored
@@ -9198,7 +9236,7 @@ void SurfaceFlinger::moveSnapshotsFromCompositionArgs( 
            snapshots[i] = std::move(layerFE->mSnapshot);

        }

    }

    if (!mLayerLifecycleManagerEnabled) {

    if (mLegacyFrontEndEnabled && !mLayerLifecycleManagerEnabled) {

        for (auto [layer, layerFE] : layers) {

            layer->updateLayerSnapshot(std::move(layerFE->mSnapshot));

        }
@@ -9235,7 +9273,7 @@ std::vector<std::pair<Layer*, LayerFE*>> SurfaceFlinger::moveSnapshotsToComposit 
                    layers.emplace_back(legacyLayer.get(), layerFE.get());

                });

    }

    if (!mLayerLifecycleManagerEnabled) {

    if (mLegacyFrontEndEnabled && !mLayerLifecycleManagerEnabled) {

        auto moveSnapshots = [&layers, &refreshArgs, cursorOnly](Layer* layer) {

            if (const auto& layerFE = layer->getCompositionEngineLayerFE()) {

                if (cursorOnly &&

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -1486,6 +1486,7 @@ private: 
    bool mPowerHintSessionEnabled;



    bool mLayerLifecycleManagerEnabled = false;

    bool mLegacyFrontEndEnabled = true;



    frontend::LayerLifecycleManager mLayerLifecycleManager GUARDED_BY(kMainThreadContext);

    frontend::LayerHierarchyBuilder mLayerHierarchyBuilder GUARDED_BY(kMainThreadContext);

services/surfaceflinger/tests/unittests/SurfaceFlinger_ColorMatrixTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ namespace android { 
class ColorMatrixTest : public CommitAndCompositeTest {};



TEST_F(ColorMatrixTest, colorMatrixChanged) {

    mFlinger.enableLayerLifecycleManager();

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;
@@ -46,7 +45,6 @@ TEST_F(ColorMatrixTest, colorMatrixChanged) { 
}



TEST_F(ColorMatrixTest, colorMatrixChangedAfterDisplayTransaction) {

    mFlinger.enableLayerLifecycleManager();

    EXPECT_COLOR_MATRIX_CHANGED(true, true);

    mFlinger.mutableTransactionFlags() |= eTransactionNeeded;

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+0 −4
Original line number Diff line number Diff line
@@ -691,10 +691,6 @@ public: 
        return mFlinger->initTransactionTraceWriter();

    }



    // Needed since mLayerLifecycleManagerEnabled is false by default and must

    // be enabled for tests to go through the new front end path.

    void enableLayerLifecycleManager() { mFlinger->mLayerLifecycleManagerEnabled = true; }



    void notifyExpectedPresentIfRequired(PhysicalDisplayId displayId, Period vsyncPeriod,

                                         TimePoint expectedPresentTime, Fps frameInterval,

                                         std::optional<Period> timeoutOpt) {