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

Commit b2bff0fc authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev am: 79632ee4 

am: fcd8985c

* commit 'fcd8985c':
  SF/HWC2: Reorder makeCurrent to avoid deadlock

Change-Id: Ie93c26d9984bfe4f4d48988a48657167a1f5b36e
parents 675bfa9d fcd8985c

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1248,6 +1248,7 @@ void SurfaceFlinger::postFramebuffer() 
        if (hwcId >= 0) {

            mHwc->commit(hwcId);

        }

        displayDevice->onSwapBuffersCompleted();

        if (displayId == 0) {

            // Make the default display current because the VirtualDisplayDevice

            // code cannot deal with dequeueBuffer() being called outside of the
@@ -1255,7 +1256,6 @@ void SurfaceFlinger::postFramebuffer() 
            // is allowed to (and does in some case) call dequeueBuffer().

            displayDevice->makeCurrent(mEGLDisplay, mEGLContext);

        }

        displayDevice->onSwapBuffersCompleted();

        for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) {

            sp<Fence> releaseFence = Fence::NO_FENCE;

            if (layer->getCompositionType(hwcId) == HWC2::Composition::Client) {