Merge "SF: process ComposerHalVsync for the active display" into sc-v2-dev (c2159564) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -1713,10 +1713,10 @@ void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t t
		ATRACE_CALL();

		Mutex::Autolock lock(mStateLock);

		if (const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId)) {
		auto token = getPhysicalDisplayTokenLocked(*displayId);
		auto display = getDisplayDeviceLocked(token);
		const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId);
		if (displayId) {
		const auto token = getPhysicalDisplayTokenLocked(*displayId);
		const auto display = getDisplayDeviceLocked(token);
		display->onVsync(timestamp);
		}

		@@ -1724,8 +1724,10 @@ void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t t
		return;
		}

		if (hwcDisplayId != getHwComposer().getInternalHwcDisplayId()) {
		// For now, we don't do anything with external display vsyncs.
		const bool isActiveDisplay =
		displayId && getPhysicalDisplayTokenLocked(*displayId) == mActiveDisplayToken;
		if (!isActiveDisplay) {
		// For now, we don't do anything with non active display vsyncs.
		return;
		}