commit 6bfe2640a1bf832041f8dbde266b0384e018846e
author Vishnu Nair <vishnun@google.com> Fri Jun 07 14:53:14 2019 -0700
committer Nataniel Borges <natanieljr@google.com> Tue Sep 24 12:27:48 2019 +0200
tree a3477bdd95e3a2a3b010a3f3475f630890c28c67
parent b57b01e59d10f943a2ea6039a7c097bdbbcf02e7

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: I2d77334f616cb4c34e6a57c84ca97425f7983152
Merged-In: I32a59475ced80d7eaa062181c732ce0f9a81cca5

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ca33bb8..9778af0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1767,6 +1767,12 @@
     mVsyncModulator.onRefreshed(mHadClientComposition);
 
     mLayersWithQueuedFrames.clear();
+    if (mVisibleRegionsDirty) {
+        mVisibleRegionsDirty = false;
+        if (mTracingEnabled) {
+            mTracing.notify("visibleRegionsDirty");
+        }
+    }
 }
 
 
@@ -1776,9 +1782,6 @@
 
     if (mVisibleRegionsDirty) {
         computeLayerBounds();
-        if (mTracingEnabled) {
-            mTracing.notify("visibleRegionsDirty");
-        }
     }
 
     for (auto& layer : mLayersPendingRefresh) {
@@ -2180,7 +2183,6 @@
     // rebuild the visible layer list per screen
     if (CC_UNLIKELY(mVisibleRegionsDirty)) {
         ATRACE_NAME("rebuildLayerStacks VR Dirty");
-        mVisibleRegionsDirty = false;
         invalidateHwcGeometry();
 
         for (const auto& pair : mDisplays) {