commit cc1ce6476e4deb8877c10b2a59afd27556ec72e9
author Pete Bentley <prb@google.com> Thu Sep 12 11:36:29 2019 +0000
committer Pete Bentley <prb@google.com> Thu Sep 12 11:36:29 2019 +0000
tree 837337ecd52c40811f5af4ee8b2e41bab8766f13
parent 4658e11cbe1abae691454ddcf93a06763d1bf828

Revert "SurfaceFlinger: add a sysprop for GL backpressure"

This reverts commit 4658e11cbe1abae691454ddcf93a06763d1bf828.

Reason for revert: Seems to be responsible for breaking git_stage-aosp-master on aosp_arm64-eng, see b/140906153

Change-Id: I8968ca1bf95988b453bc33cd78a6389d6cb38a4f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6166789..2d31910 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -353,11 +353,6 @@
     mPropagateBackpressure = !atoi(value);
     ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation");
 
-    property_get("debug.sf.enable_gl_backpressure", value, "0");
-    mPropagateBackpressureClientComposition = atoi(value);
-    ALOGI_IF(mPropagateBackpressureClientComposition,
-             "Enabling backpressure propagation for Client Composition");
-
     property_get("debug.sf.enable_hwc_vds", value, "0");
     mUseHwcVirtualDisplays = atoi(value);
     ALOGI_IF(mUseHwcVirtualDisplays, "Enabling HWC virtual displays");
@@ -1675,9 +1670,9 @@
                 break;
             }
 
-            if (frameMissed && mPropagateBackpressure) {
-                if ((hwcFrameMissed && !gpuFrameMissed) ||
-                    mPropagateBackpressureClientComposition) {
+            // For now, only propagate backpressure when missing a hwc frame.
+            if (hwcFrameMissed && !gpuFrameMissed) {
+                if (mPropagateBackpressure) {
                     signalLayerUpdate();
                     break;
                 }