Merge cherrypicks of [7932501, 7932502, 7932326] into qt-c2f2-release (612a9ea1) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+23 −3

Original line number	Diff line number	Diff line
		@@ -1530,10 +1530,25 @@ void SurfaceFlinger::onRefreshReceived(int sequenceId, hwc2_display_t /*hwcDispl

		void SurfaceFlinger::setPrimaryVsyncEnabled(bool enabled) {
		ATRACE_CALL();
		Mutex::Autolock lock(mStateLock);

		// Enable / Disable HWVsync from the main thread to avoid race conditions with
		// display power state.
		postMessageAsync(new LambdaMessage(
		[=]() NO_THREAD_SAFETY_ANALYSIS { setPrimaryVsyncEnabledInternal(enabled); }));
		}

		void SurfaceFlinger::setPrimaryVsyncEnabledInternal(bool enabled) {
		ATRACE_CALL();

		if (const auto displayId = getInternalDisplayIdLocked()) {
		sp<DisplayDevice> display = getDefaultDisplayDeviceLocked();
		if (display && display->isPoweredOn()) {
		getHwComposer().setVsyncEnabled(*displayId,
		enabled ? HWC2::Vsync::Enable : HWC2::Vsync::Disable);
		} else {
		// Cache the latest vsync state and apply it when screen is on again
		mEnableHWVsyncScreenOn = enabled;
		}
		}
		}

		@@ -4431,6 +4446,11 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, int
		// Turn on the display
		getHwComposer().setPowerMode(*displayId, mode);
		if (display->isPrimary() && mode != HWC_POWER_MODE_DOZE_SUSPEND) {
		if (mEnableHWVsyncScreenOn) {
		setPrimaryVsyncEnabledInternal(mEnableHWVsyncScreenOn);
		mEnableHWVsyncScreenOn = false;
		}

		mScheduler->onScreenAcquired(mAppConnectionHandle);
		mScheduler->resyncToHardwareVsync(true, getVsyncPeriod());
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,9 @@ public:
		// TODO: this should be made accessible only to EventThread
		void setPrimaryVsyncEnabled(bool enabled);

		// main thread function to enable/disable h/w composer event
		void setPrimaryVsyncEnabledInternal(bool enabled);

		// called on the main thread by MessageQueue when an internal message
		// is received
		// TODO: this should be made accessible only to MessageQueue
		@@ -1168,6 +1171,9 @@ private:
		// The Layer pointer is removed from the set when the destructor is called so there shouldn't
		// be any issues with a raw pointer referencing an invalid object.
		std::unordered_set<Layer*> mOffscreenLayers;

		// Flag to indicate whether to re-enable HWVsync when screen is on
		bool mEnableHWVsyncScreenOn = false;
		};

		} // namespace android