diff options
author | Pete Bentley <prb@google.com> | 2019-09-12 11:36:29 +0000 |
---|---|---|
committer | Pete Bentley <prb@google.com> | 2019-09-12 11:36:29 +0000 |
commit | cc1ce6476e4deb8877c10b2a59afd27556ec72e9 (patch) | |
tree | 837337ecd52c40811f5af4ee8b2e41bab8766f13 | |
parent | 4658e11cbe1abae691454ddcf93a06763d1bf828 (diff) | |
download | native-cc1ce6476e4deb8877c10b2a59afd27556ec72e9.tar.gz |
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
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 11 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 6166789fc4..2d319101b3 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -353,11 +353,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 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 @@ void SurfaceFlinger::onMessageReceived(int32_t what) NO_THREAD_SAFETY_ANALYSIS { 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; } diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 52655944de..ddfe88c928 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -1003,7 +1003,6 @@ private: volatile nsecs_t mDebugInTransaction = 0; bool mForceFullDamage = false; bool mPropagateBackpressure = true; - bool mPropagateBackpressureClientComposition = false; std::unique_ptr<SurfaceInterceptor> mInterceptor; SurfaceTracing mTracing{*this}; bool mTracingEnabled = false; |