Revert "SF: Bring back support for disabling backpressure propagation"
This reverts commit e0912b5c5323877fc959eec8a15532b4fee96665.
Reason for revert: Conflicts with QPR3
Change-Id: Ifd199791be887118df7a32e2af517b59f3da0f00
diff --git a/services/surfaceflinger/Scheduler/Scheduler.h b/services/surfaceflinger/Scheduler/Scheduler.h
index d7b07f2..ce585c6 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.h
+++ b/services/surfaceflinger/Scheduler/Scheduler.h
@@ -497,8 +497,7 @@
schedulePtr(std::move(schedulePtr)),
targeterPtr(std::make_unique<
FrameTargeter>(displayId,
- features.test(Feature::kBackpressureGpuComposition),
- features.test(Feature::kPropagateBackpressure))) {}
+ features.test(Feature::kBackpressureGpuComposition))) {}
const PhysicalDisplayId displayId;
diff --git a/services/surfaceflinger/Scheduler/include/scheduler/Features.h b/services/surfaceflinger/Scheduler/include/scheduler/Features.h
index def30d1..7c72ac6 100644
--- a/services/surfaceflinger/Scheduler/include/scheduler/Features.h
+++ b/services/surfaceflinger/Scheduler/include/scheduler/Features.h
@@ -29,7 +29,6 @@
kTracePredictedVsync = 1 << 3,
kBackpressureGpuComposition = 1 << 4,
kSmallDirtyContentDetection = 1 << 5,
- kPropagateBackpressure = 1 << 6,
};
using FeatureFlags = ftl::Flags<Feature>;
diff --git a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
index e92c1ac..70d4846 100644
--- a/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
+++ b/services/surfaceflinger/Scheduler/include/scheduler/FrameTargeter.h
@@ -105,10 +105,9 @@
// Computes a display's per-frame metrics about past/upcoming targeting of present deadlines.
class FrameTargeter final : private FrameTarget {
public:
- FrameTargeter(PhysicalDisplayId displayId, bool backpressureGpuComposition, bool propagateBackpressure)
+ FrameTargeter(PhysicalDisplayId displayId, bool backpressureGpuComposition)
: FrameTarget(to_string(displayId)),
- mBackpressureGpuComposition(backpressureGpuComposition),
- mPropagateBackpressure(propagateBackpressure) {}
+ mBackpressureGpuComposition(backpressureGpuComposition) {}
const FrameTarget& target() const { return *this; }
@@ -139,7 +138,6 @@
static bool isFencePending(const FenceTimePtr&, int graceTimeMs);
const bool mBackpressureGpuComposition;
- const bool mPropagateBackpressure;
TimePoint mScheduledPresentTime;
CompositionCoverageFlags mCompositionCoverage;
diff --git a/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp b/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
index 2183712..e80372b 100644
--- a/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
+++ b/services/surfaceflinger/Scheduler/src/FrameTargeter.cpp
@@ -93,7 +93,7 @@
//
// TODO(b/280667110): The grace period should depend on `sfWorkDuration` and `vsyncPeriod` being
// approximately equal, not whether backpressure propagation is enabled.
- const int graceTimeForPresentFenceMs = mPropagateBackpressure && static_cast<int>(
+ const int graceTimeForPresentFenceMs = static_cast<int>(
mBackpressureGpuComposition || !mCompositionCoverage.test(CompositionCoverage::Gpu));
// Pending frames may trigger backpressure propagation.
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7d8e3ed..4fe729f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -484,10 +484,6 @@
mDebugFlashDelay = base::GetUintProperty("debug.sf.showupdates"s, 0u);
- property_get("debug.sf.disable_backpressure", value, "0");
- mPropagateBackpressure = !atoi(value);
- ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation");
-
mBackpressureGpuComposition = base::GetBoolProperty("debug.sf.enable_gl_backpressure"s, true);
ALOGI_IF(mBackpressureGpuComposition, "Enabling backpressure for GPU composition");
@@ -2551,7 +2547,7 @@
}
if (pacesetterFrameTarget.isFramePending()) {
- if (mPropagateBackpressure && (mBackpressureGpuComposition || pacesetterFrameTarget.didMissHwcFrame())) {
+ if (mBackpressureGpuComposition || pacesetterFrameTarget.didMissHwcFrame()) {
if (FlagManager::getInstance().vrr_config()) {
mScheduler->getVsyncSchedule()->getTracker().onFrameMissed(
pacesetterFrameTarget.expectedPresentTime());
@@ -4226,9 +4222,6 @@
if (mBackpressureGpuComposition) {
features |= Feature::kBackpressureGpuComposition;
}
- if (mPropagateBackpressure) {
- features |= Feature::kPropagateBackpressure;
- }
auto modulatorPtr = sp<VsyncModulator>::make(mVsyncConfiguration->getCurrentConfigs());
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 2805f0d..6b44401 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1306,7 +1306,6 @@
std::atomic_bool mForceFullDamage = false;
bool mLayerCachingEnabled = false;
- bool mPropagateBackpressure = true;
bool mBackpressureGpuComposition = false;
LayerTracing mLayerTracing;