surfacefligner: revert recent BE/FE split changes
This reverts the following changes:
"SF: Restructure message refresh"
"SF: Add sideband stream setup to setUpHwComposer"
"SF: Support SolidColor layers in setUpHwComposer"
"SF: Move config of HWComposer to setupHwComposer"
"SF: Use CompositionInfo to program HWComposer"
Bug: 76421986
Bug: 76426897
Bug: 76432611
Test: manual and CTS
Change-Id: Ia0c5edaa3a077ba148c8880bee740381fd72f2ca
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 77efa54..99bbb13 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -214,8 +214,6 @@
// use to differentiate callbacks from different hardware composer
// instances. Each hardware composer instance gets a different sequence id.
int32_t mComposerSequenceId;
-
- std::vector<CompositionInfo> mCompositionInfo;
};
@@ -628,8 +626,8 @@
void computeVisibleRegions(const sp<const DisplayDevice>& displayDevice,
Region& dirtyRegion, Region& opaqueRegion);
- void preComposition();
- void postComposition();
+ void preComposition(nsecs_t refreshStartTime);
+ void postComposition(nsecs_t refreshStartTime);
void updateCompositorTiming(
nsecs_t vsyncPhase, nsecs_t vsyncInterval, nsecs_t compositeTime,
std::shared_ptr<FenceTime>& presentFenceTime);
@@ -646,19 +644,7 @@
mat4 computeSaturationMatrix() const;
- void calculateWorkingSet();
- /*
- * beginFrame - This function handles any pre-frame processing that needs to be
- * prior to any CompositionInfo handling and is not dependent on data in
- * CompositionInfo
- */
- void beginFrame();
- /* prepareFrame - This function will call into the DisplayDevice to prepare a
- * frame after CompositionInfo has been programmed. This provides a mechanism
- * to prepare the hardware composer
- */
- void prepareFrame();
- void setUpHWComposer(const CompositionInfo& compositionInfo);
+ void setUpHWComposer();
void doComposition();
void doDebugFlashRegions();
void doTracing(const char* where);
@@ -768,11 +754,6 @@
// access must be protected by mInvalidateLock
volatile int32_t mRepaintEverything;
- // helper methods
- void configureHwcCommonData(const CompositionInfo& compositionInfo) const;
- void configureDeviceComposition(const CompositionInfo& compositionInfo) const;
- void configureSidebandComposition(const CompositionInfo& compositionInfo) const;
-
// constant members (no synchronization needed for access)
nsecs_t mBootTime;
bool mGpuToCpuSupported;
@@ -840,7 +821,6 @@
Mutex mHWVsyncLock;
bool mPrimaryHWVsyncEnabled;
bool mHWVsyncAvailable;
- nsecs_t mRefreshStartTime;
std::atomic<bool> mRefreshPending{false};