tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dev

Browse source
This commit is contained in:
Chia-I Wu 2017-09-07 17:18:25 +00:00 committed by Android (Google) Code Review
commit ef3389add5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerTestUtils.cpp
View file

@ -290,6 +290,11 @@ void ComposerClient::setVsyncEnabled(Display display, bool enabled) {
: IComposerClient::Vsync::DISABLE; : IComposerClient::Vsync::DISABLE;
Error error = mClient->setVsyncEnabled(display, vsync); Error error = mClient->setVsyncEnabled(display, vsync);
ASSERT_EQ(Error::NONE, error) << "failed to set vsync mode"; ASSERT_EQ(Error::NONE, error) << "failed to set vsync mode";
// give the hwbinder thread some time to handle any pending vsync callback
if (!enabled) {
usleep(5 * 1000);
}
} }
} // namespace tests } // namespace tests

6
graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
View file

@ -118,7 +118,7 @@ class GraphicsComposerCallback : public IComposerCallback {
// the set of all currently connected displays // the set of all currently connected displays
std::unordered_set<Display> mDisplays; std::unordered_set<Display> mDisplays;
// true only when vsync is enabled // true only when vsync is enabled
bool mVsyncAllowed = false; bool mVsyncAllowed = true;
// track invalid callbacks // track invalid callbacks
int mInvalidHotplugCount = 0; int mInvalidHotplugCount = 0;
@ -137,6 +137,10 @@ class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase {
// assume the first display is primary and is never removed // assume the first display is primary and is never removed
mPrimaryDisplay = waitForFirstDisplay(); mPrimaryDisplay = waitForFirstDisplay();
// explicitly disable vsync
mComposerClient->setVsyncEnabled(mPrimaryDisplay, false);
mComposerCallback->setVsyncAllowed(false);
} }
void TearDown() override { void TearDown() override {