From 4509505ce08d1d5830ea38cc94640f63d339b8c1 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 23 Mar 2023 18:23:15 -0400 Subject: [PATCH] Revert "Add a DisplayCapability for multi-threaded present" This reverts commit b3e336edd112667ba174f268ad4cce53a484c545. Bug: 274954820 Test: build Change-Id: I6265f8de3db31f07506906cee82a91fe3baac0bc --- .../graphics/composer3/DisplayCapability.aidl | 1 - .../graphics/composer3/DisplayCapability.aidl | 16 ---------------- .../vts/VtsHalGraphicsComposer3_TargetTest.cpp | 16 +--------------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DisplayCapability.aidl b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DisplayCapability.aidl index 0e2d72bae0..6eba887aef 100644 --- a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DisplayCapability.aidl +++ b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DisplayCapability.aidl @@ -42,5 +42,4 @@ enum DisplayCapability { AUTO_LOW_LATENCY_MODE = 5, SUSPEND = 6, DISPLAY_IDLE_TIMER = 7, - MULTI_THREADED_PRESENT = 8, } diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/DisplayCapability.aidl b/graphics/composer/aidl/android/hardware/graphics/composer3/DisplayCapability.aidl index 7154d74499..f4b29843b8 100644 --- a/graphics/composer/aidl/android/hardware/graphics/composer3/DisplayCapability.aidl +++ b/graphics/composer/aidl/android/hardware/graphics/composer3/DisplayCapability.aidl @@ -80,20 +80,4 @@ enum DisplayCapability { * IComposerCallback.onVsyncIdle. */ DISPLAY_IDLE_TIMER = 7, - /** - * Indicates that both the composer HAL implementation and the given display - * support calling executeCommands concurrently from separate threads. - * executeCommands for a particular display will never run concurrently to - * any other executeCommands for the same display. In addition, the - * CommandResultPayload must only reference displays included in the - * DisplayCommands passed to executeCommands. Displays referenced from - * separate threads must have minimal interference with one another. If a - * HWC-managed display has this capability, SurfaceFlinger can run - * executeCommands for this display concurrently with other displays with the - * same capability. - * @see IComposerClient.executeCommands - * @see DisplayCommand.presentDisplay - * @see DisplayCommand.validateDisplay - */ - MULTI_THREADED_PRESENT = 8, } diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp index 746330b148..5116774b40 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp @@ -2494,20 +2494,6 @@ TEST_P(GraphicsComposerAidlTest, GetDisplayConfigNoRepetitions) { } } -TEST_P(GraphicsComposerAidlCommandTest, MultiThreadedPresent) { - std::vector displays; - for (auto& display : mDisplays) { - if (hasDisplayCapability(display.getDisplayId(), - DisplayCapability::MULTI_THREADED_PRESENT)) { - displays.push_back(&display); - } - } - if (displays.size() <= 1u) { - return; - } - // TODO(b/251842321): Try to present on multiple threads. -} - /** * Test Capability::SKIP_VALIDATE * @@ -2583,4 +2569,4 @@ int main(int argc, char** argv) { } return RUN_ALL_TESTS(); -} \ No newline at end of file +}