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

Commit df529053 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Fix surface tracing thread sync issues 

Tracing thread was incorrectly reading the drawing state while it was being
updated by the surface flinger main thread. Move the notify to after
composition.

Fixes: 134752356
Test: capture surface flinger trace
Change-Id: I32a59475ced80d7eaa062181c732ce0f9a81cca5
parent a1624bc4

services/surfaceflinger/SurfaceFlinger.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1783,6 +1783,12 @@ void SurfaceFlinger::handleMessageRefresh() { 
    mVsyncModulator.onRefreshed(mHadClientComposition);



    mLayersWithQueuedFrames.clear();

    if (mVisibleRegionsDirty) {

        mVisibleRegionsDirty = false;

        if (mTracingEnabled) {

            mTracing.notify("visibleRegionsDirty");

        }

    }

}
@@ -1792,9 +1798,6 @@ bool SurfaceFlinger::handleMessageInvalidate() { 


    if (mVisibleRegionsDirty) {

        computeLayerBounds();

        if (mTracingEnabled) {

            mTracing.notify("visibleRegionsDirty");

        }

    }



    for (auto& layer : mLayersPendingRefresh) {
@@ -2189,7 +2192,6 @@ void SurfaceFlinger::rebuildLayerStacks() { 
    // rebuild the visible layer list per screen

    if (CC_UNLIKELY(mVisibleRegionsDirty)) {

        ATRACE_NAME("rebuildLayerStacks VR Dirty");

        mVisibleRegionsDirty = false;

        invalidateHwcGeometry();



        for (const auto& pair : mDisplays) {