Merge "SF: check previous present fence to avoid early presentation" into sc-dev (e1c1b1c5) · Commits · e / os / android_frameworks_native

services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <compositionengine/LayerFE.h>
		#include <compositionengine/OutputColorSetting.h>
		#include <math/mat4.h>
		#include <ui/FenceTime.h>
		#include <ui/Transform.h>

		namespace android::compositionengine {
		@@ -83,6 +84,10 @@ struct CompositionRefreshArgs {
		// The earliest time to send the present command to the HAL
		std::chrono::steady_clock::time_point earliestPresentTime;

		// The previous present fence. Used together with earliestPresentTime
		// to prevent an early presentation of a frame.
		std::shared_ptr<FenceTime> previousPresentFence;

		// The predicted next invalidation time
		std::optional<std::chrono::steady_clock::time_point> nextInvalidateTime;
		};

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <cstdint>

		#include <math/mat4.h>
		#include <ui/FenceTime.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		@@ -118,6 +119,10 @@ struct OutputCompositionState {
		// The earliest time to send the present command to the HAL
		std::chrono::steady_clock::time_point earliestPresentTime;

		// The previous present fence. Used together with earliestPresentTime
		// to prevent an early presentation of a frame.
		std::shared_ptr<FenceTime> previousPresentFence;

		// Current display brightness
		float displayBrightnessNits{-1.f};

services/surfaceflinger/CompositionEngine/src/Display.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -229,7 +229,8 @@ void Display::chooseCompositionStrategy() {
		auto& hwc = getCompositionEngine().getHwComposer();
		if (status_t result =
		hwc.getDeviceCompositionChanges(*halDisplayId, anyLayersRequireClientComposition(),
		getState().earliestPresentTime, &changes);
		getState().earliestPresentTime,
		getState().previousPresentFence, &changes);
		result != NO_ERROR) {
		ALOGE("chooseCompositionStrategy failed for %s: %d (%s)", getName().c_str(), result,
		strerror(-result));
		@@ -330,7 +331,8 @@ compositionengine::Output::FrameFences Display::presentAndGetFrameFences() {
		}

		auto& hwc = getCompositionEngine().getHwComposer();
		hwc.presentAndGetReleaseFences(*halDisplayIdOpt, getState().earliestPresentTime);
		hwc.presentAndGetReleaseFences(*halDisplayIdOpt, getState().earliestPresentTime,
		getState().previousPresentFence);

		fences.presentFence = hwc.getPresentFence(*halDisplayIdOpt);

services/surfaceflinger/CompositionEngine/src/Output.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -729,6 +729,7 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr
		}

		editState().earliestPresentTime = refreshArgs.earliestPresentTime;
		editState().previousPresentFence = refreshArgs.previousPresentFence;

		compositionengine::OutputLayer* peekThroughLayer = nullptr;
		sp<GraphicBuffer> previousOverride = nullptr;

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -579,7 +579,7 @@ TEST_F(DisplayChooseCompositionStrategyTest, takesEarlyOutIfGpuDisplay) {
		TEST_F(DisplayChooseCompositionStrategyTest, takesEarlyOutOnHwcError) {
		EXPECT_CALL(*mDisplay, anyLayersRequireClientComposition()).WillOnce(Return(false));
		EXPECT_CALL(mHwComposer,
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), false, _, _))
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), false, _, _, _))
		.WillOnce(Return(INVALID_OPERATION));

		mDisplay->chooseCompositionStrategy();
		@@ -602,7 +602,7 @@ TEST_F(DisplayChooseCompositionStrategyTest, normalOperation) {
		.WillOnce(Return(false));

		EXPECT_CALL(mHwComposer,
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), true, _, _))
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), true, _, _, _))
		.WillOnce(Return(NO_ERROR));
		EXPECT_CALL(*mDisplay, allLayersRequireClientComposition()).WillOnce(Return(false));

		@@ -633,8 +633,8 @@ TEST_F(DisplayChooseCompositionStrategyTest, normalOperationWithChanges) {
		.WillOnce(Return(false));

		EXPECT_CALL(mHwComposer,
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), true, _, _))
		.WillOnce(DoAll(SetArgPointee<3>(changes), Return(NO_ERROR)));
		getDeviceCompositionChanges(HalDisplayId(DEFAULT_DISPLAY_ID), true, _, _, _))
		.WillOnce(DoAll(SetArgPointee<4>(changes), Return(NO_ERROR)));
		EXPECT_CALL(*mDisplay, applyChangedTypesToLayers(changes.changedTypes)).Times(1);
		EXPECT_CALL(*mDisplay, applyDisplayRequests(changes.displayRequests)).Times(1);
		EXPECT_CALL(*mDisplay, applyLayerRequestsToLayers(changes.layerRequests)).Times(1);
		@@ -844,7 +844,7 @@ TEST_F(DisplayPresentAndGetFrameFencesTest, returnsPresentAndLayerFences) {
		sp<Fence> layer1Fence = new Fence();
		sp<Fence> layer2Fence = new Fence();

		EXPECT_CALL(mHwComposer, presentAndGetReleaseFences(HalDisplayId(DEFAULT_DISPLAY_ID), _))
		EXPECT_CALL(mHwComposer, presentAndGetReleaseFences(HalDisplayId(DEFAULT_DISPLAY_ID), _, _))
		.Times(1);
		EXPECT_CALL(mHwComposer, getPresentFence(HalDisplayId(DEFAULT_DISPLAY_ID)))
		.WillOnce(Return(presentFence));
		@@ -1020,7 +1020,7 @@ TEST_F(DisplayFunctionalTest, postFramebufferCriticalCallsAreOrdered) {

		mDisplay->editState().isEnabled = true;

		EXPECT_CALL(mHwComposer, presentAndGetReleaseFences(_, _));
		EXPECT_CALL(mHwComposer, presentAndGetReleaseFences(_, _, _));
		EXPECT_CALL(*mDisplaySurface, onFrameCommitted());

		mDisplay->postFramebuffer();