Merge "Revert "Add a DisplayCapability for multi-threaded present"" into udc-dev

This commit is contained in:
Brian Johnson
2023-03-31 01:55:24 +00:00
committed by Android (Google) Code Review
3 changed files with 1 additions and 32 deletions

View File

@@ -42,5 +42,4 @@ enum DisplayCapability {
AUTO_LOW_LATENCY_MODE = 5,
SUSPEND = 6,
DISPLAY_IDLE_TIMER = 7,
MULTI_THREADED_PRESENT = 8,
}

View File

@@ -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,
}

View File

@@ -2518,20 +2518,6 @@ TEST_P(GraphicsComposerAidlTest, GetDisplayConfigNoRepetitions) {
}
}
TEST_P(GraphicsComposerAidlCommandTest, MultiThreadedPresent) {
std::vector<VtsDisplay*> 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
*
@@ -2605,4 +2591,4 @@ int main(int argc, char** argv) {
}
return RUN_ALL_TESTS();
}
}