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

Commit 5690bdaa authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: check isVsyncValid based on the transaction submitter 

isVsyncValid is used to throttle applications to a lower frame rate than
the display refresh rate. With the current implementation of BlastSync
we may get a single transaction that contains layers from different
applications, we may cause to throttle unindended applications
(such as SystemUI). Instead, we are checking the transaction submitter
for whether we should throttle the transaction or not.

Bug: 182587984
Test: atest FrameRateOverrideHostTest
Change-Id: I7dd0c4c1ac945d6142afcdc8ba62c5a48a6dbb00
parent c7900120

services/surfaceflinger/SurfaceFlinger.cpp

+10 −8
Original line number Diff line number Diff line
@@ -3316,7 +3316,8 @@ void SurfaceFlinger::flushTransactionQueues() { 
                    if (!transactionIsReadyToBeApplied(transaction.frameTimelineInfo,

                                                       transaction.isAutoTimestamp,

                                                       transaction.desiredPresentTime,

                                                       transaction.states, pendingBuffers)) {

                                                       transaction.originUid, transaction.states,

                                                       pendingBuffers)) {

                        setTransactionFlags(eTransactionFlushNeeded);

                        break;

                    }
@@ -3343,7 +3344,8 @@ void SurfaceFlinger::flushTransactionQueues() { 
                if (!transactionIsReadyToBeApplied(transaction.frameTimelineInfo,

                                                   transaction.isAutoTimestamp,

                                                   transaction.desiredPresentTime,

                                                   transaction.states, pendingBuffers) ||

                                                   transaction.originUid, transaction.states,

                                                   pendingBuffers) ||

                    pendingTransactions) {

                    mPendingTransactionQueues[transaction.applyToken].push(transaction);

                } else {
@@ -3374,7 +3376,7 @@ bool SurfaceFlinger::transactionFlushNeeded() { 


bool SurfaceFlinger::transactionIsReadyToBeApplied(

        const FrameTimelineInfo& info, bool isAutoTimestamp, int64_t desiredPresentTime,

        const Vector<ComposerState>& states,

        uid_t originUid, const Vector<ComposerState>& states,

        std::unordered_set<sp<IBinder>, ISurfaceComposer::SpHash<IBinder>>& pendingBuffers) {

    ATRACE_CALL();

    const nsecs_t expectedPresentTime = mExpectedPresentTime.load();
@@ -3387,6 +3389,11 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied( 
        ready = false;

    }



    if (!mScheduler->isVsyncValid(expectedPresentTime, originUid)) {

        ATRACE_NAME("!isVsyncValid");

        ready = false;

    }



    for (const ComposerState& state : states) {

        const layer_state_t& s = state.state;

        const bool acquireFenceChanged = (s.what & layer_state_t::eAcquireFenceChanged);
@@ -3415,11 +3422,6 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied( 
            ready = false;

        }



        if (!mScheduler->isVsyncValid(expectedPresentTime, layer->getOwnerUid())) {

            ATRACE_NAME("!isVsyncValidForUid");

            ready = false;

        }



        if (acquireFenceChanged) {

            // If backpressure is enabled and we already have a buffer to commit, keep the

            // transaction in the queue.

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ private: 
    void commitOffscreenLayers();

    bool transactionIsReadyToBeApplied(

            const FrameTimelineInfo& info, bool isAutoTimestamp, int64_t desiredPresentTime,

            const Vector<ComposerState>& states,

            uid_t originUid, const Vector<ComposerState>& states,

            std::unordered_set<sp<IBinder>, ISurfaceComposer::SpHash<IBinder>>& pendingBuffers)

            REQUIRES(mStateLock);

    uint32_t setDisplayStateLocked(const DisplayState& s) REQUIRES(mStateLock);