Merge "Revert "SF: opportunistically try to present the next vsync on e..."" into main (ff2eb17f) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@ cc_defaults {
		"-Wconversion",
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		],
		static_libs: [
		"libsurfaceflingerflags",
		],
		}

		cc_defaults {

+0 −3

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ cc_defaults {
		cc_library {
		name: "libcompositionengine",
		defaults: ["libcompositionengine_defaults"],
		static_libs: ["libsurfaceflingerflags"],
		srcs: [
		"src/planner/CachedSet.cpp",
		"src/planner/Flattener.cpp",
		@@ -108,7 +107,6 @@ cc_library {
		"libgtest",
		"libgmock",
		"libcompositionengine",
		"libsurfaceflingerflags_test",
		],
		local_include_dirs: ["include"],
		export_include_dirs: ["include"],
		@@ -143,7 +141,6 @@ cc_test {
		"librenderengine_mocks",
		"libgmock",
		"libgtest",
		"libsurfaceflingerflags_test",
		],
		// For some reason, libvulkan isn't picked up from librenderengine
		// Probably ASAN related?

+2 −11

Original line number	Diff line number	Diff line
		@@ -28,13 +28,10 @@
		#include "VSyncDispatchTimerQueue.h"
		#include "VSyncTracker.h"

		#include <com_android_graphics_surfaceflinger_flags.h>

		#undef LOG_TAG
		#define LOG_TAG "VSyncDispatch"

		namespace android::scheduler {
		using namespace com::android::graphics::surfaceflinger;

		using base::StringAppendF;

		@@ -103,15 +100,9 @@ ScheduleResult VSyncDispatchTimerQueueEntry::schedule(VSyncDispatch::ScheduleTim
		mArmedInfo && (nextVsyncTime > (mArmedInfo->mActualVsyncTime + mMinVsyncDistance));
		bool const wouldSkipAWakeup =
		mArmedInfo && ((nextWakeupTime > (mArmedInfo->mActualWakeupTime + mMinVsyncDistance)));
		if (flags::dont_skip_on_early()) {
		if (wouldSkipAVsyncTarget \|\| wouldSkipAWakeup) {
		return getExpectedCallbackTime(mArmedInfo->mActualVsyncTime, timing);
		}
		} else {
		if (wouldSkipAVsyncTarget && wouldSkipAWakeup) {
		return getExpectedCallbackTime(nextVsyncTime, timing);
		}
		}

		nextVsyncTime = adjustVsyncIfNeeded(tracker, nextVsyncTime);
		nextWakeupTime = nextVsyncTime - timing.workDuration - timing.readyDuration;

+0 −2

Original line number	Diff line number	Diff line
		@@ -6446,8 +6446,6 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, const std::string& comp
		mMisc2FlagEarlyBootValue == mMisc2FlagLateBootValue ? "stable" : "modified");
		StringAppendF(&result, "VrrConfigFlagValue: %s\n",
		flagutils::vrrConfigEnabled() ? "true" : "false");
		StringAppendF(&result, "DontSkipOnEarlyFlagValue: %s\n",
		flags::dont_skip_on_early() ? "true" : "false");

		getRenderEngine().dump(result);

+0 −7

Original line number	Diff line number	Diff line
		@@ -38,10 +38,3 @@ flag {
		bug: "283055450"
		is_fixed_read_only: true
		}

		flag {
		name: "dont_skip_on_early"
		namespace: "core_graphics"
		description: "This flag is guarding the behaviour where SurfaceFlinger is trying to opportunistically present a frame when the configuration change from late to early"
		bug: "273702768"
		}