Commit 57fc3d60 authored Dec 11, 2021 by yuhui.zhang Committed by Robert Chou Jan 11, 2022

Do not handle VSync event during resolution switch

When there is a resolution switch, SurfaceFlinger will handle as display
changes. If the VSync comes before the display is ready, the access to
the display will bring exception.

Solution: Add mutex lock between onComposerHalVsync() and
setActiveModeInternal().

Bug: 210378166
Test: run cts-on-gsi -m CtsDisplayTestCases
Change-Id: Ide53b0e5cff3b569593a2ed388d0ea66e0002e9d
Merged-In: Ide53b0e5cff3b569593a2ed388d0ea66e0002e9d

parent 40c7ef8d

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -1949,7 +1949,10 @@ void SurfaceFlinger::onMessageInvalidate(int64_t vsyncId, nsecs_t expectedVSyncT
		// We received the present fence from the HWC, so we assume it successfully updated
		// the mode, hence we update SF.
		mSetActiveModePending = false;
		ON_MAIN_THREAD(setActiveModeInternal());
		{
		Mutex::Autolock lock(mStateLock);
		setActiveModeInternal();
		}
		}

		if (framePending) {