Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

composer: update VtsDisplay dimensions

Browse Source 
When the active config changes, the display dimension might change
as well, so we need to update it to match the active config.

Test: run composer 2.4 VTS
Bug: 185195256
Change-Id: Ie2671e61498d2501901885b2a9986ee1974bd641
Merged-In: Ie2671e61498d2501901885b2a9986ee1974bd641
(cherry picked from commit c801385495)
This commit is contained in:
Ady Abraham
2021-04-13 20:58:03 -07:00
parent 7244044c38
commit 4a654833c0
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp
View File

@@ -71,10 +71,15 @@ class VtsDisplay {
IComposerClient::Rect getFrameRect() const { return {0, 0, mDisplayWidth, mDisplayHeight}; }
void setDimensions(int32_t displayWidth, int32_t displayHeight) const {
mDisplayWidth = displayWidth;
mDisplayHeight = displayHeight;
}
private:
const Display mDisplay;
const int32_t mDisplayWidth;
const int32_t mDisplayHeight;
mutable int32_t mDisplayWidth;
mutable int32_t mDisplayHeight;
};
class GraphicsComposerHidlTest : public ::testing::TestWithParam<std::string> {
@@ -192,6 +197,31 @@ class GraphicsComposerHidlTest : public ::testing::TestWithParam<std::string> {
const std::vector<ContentType>& capabilities,
const ContentType& contentType, const char* contentTypeStr);
Error setActiveConfigWithConstraints(
const VtsDisplay& display, Config config,
const IComposerClient::VsyncPeriodChangeConstraints& constraints,
VsyncPeriodChangeTimeline* timeline) {
const auto error = mComposerClient->setActiveConfigWithConstraints(display.get(), config,
constraints, timeline);
if (error == Error::NONE) {
const int32_t displayWidth = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::WIDTH);
const int32_t displayHeight = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::HEIGHT);
display.setDimensions(displayWidth, displayHeight);
}
return error;
}
void setActiveConfig(const VtsDisplay& display, Config config) {
mComposerClient->setActiveConfig(display.get(), config);
const int32_t displayWidth = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::WIDTH);
const int32_t displayHeight = mComposerClient->getDisplayAttribute_2_4(
display.get(), config, IComposerClient::Attribute::HEIGHT);
display.setDimensions(displayWidth, displayHeight);
}
private:
// use the slot count usually set by SF
static constexpr uint32_t kBufferSlotCount = 64;
@@ -303,8 +333,8 @@ TEST_P(GraphicsComposerHidlTest, getDisplayVsyncPeriod) {
constraints.desiredTimeNanos = systemTime();
constraints.seamlessRequired = false;
EXPECT_EQ(Error::NONE, mComposerClient->setActiveConfigWithConstraints(
display.get(), config, constraints, &timeline));
EXPECT_EQ(Error::NONE,
setActiveConfigWithConstraints(display, config, constraints, &timeline));
if (timeline.refreshRequired) {
sendRefreshFrame(display, &timeline);
@@ -359,8 +389,7 @@ TEST_P(GraphicsComposerHidlTest, setActiveConfigWithConstraints_BadConfig) {
for (const auto& display : mDisplays) {
Config invalidConfigId = GetInvalidConfigId(display.get());
EXPECT_EQ(Error::BAD_CONFIG,
mComposerClient->setActiveConfigWithConstraints(display.get(), invalidConfigId,
constraints, &timeline));
setActiveConfigWithConstraints(display, invalidConfigId, constraints, &timeline));
}
}
@@ -380,11 +409,10 @@ TEST_P(GraphicsComposerHidlTest, setActiveConfigWithConstraints_SeamlessNotAllow
display.get(), config2,
IComposerClient::IComposerClient::Attribute::CONFIG_GROUP);
if (configGroup1 != configGroup2) {
mComposerClient->setActiveConfig(display.get(), config1);
setActiveConfig(display, config1);
sendRefreshFrame(display, nullptr);
EXPECT_EQ(Error::SEAMLESS_NOT_ALLOWED,
mComposerClient->setActiveConfigWithConstraints(display.get(), config2,
constraints, &timeline));
setActiveConfigWithConstraints(display, config2, constraints, &timeline));
}
});
}
@@ -447,6 +475,8 @@ void GraphicsComposerHidlTest::sendRefreshFrame(const VtsDisplay& display,
mWriter->presentDisplay();
execute();
ASSERT_NO_FATAL_FAILURE(mComposerClient->destroyLayer(display.get(), layer));
}
void GraphicsComposerHidlTest::waitForVsyncPeriodChange(Display display,
@@ -470,7 +500,7 @@ void GraphicsComposerHidlTest::waitForVsyncPeriodChange(Display display,
void GraphicsComposerHidlTest::Test_setActiveConfigWithConstraints(const TestParameters& params) {
for (const auto& display : mDisplays) {
forEachTwoConfigs(display.get(), [&](Config config1, Config config2) {
mComposerClient->setActiveConfig(display.get(), config1);
setActiveConfig(display, config1);
sendRefreshFrame(display, nullptr);
int32_t vsyncPeriod1 = mComposerClient->getDisplayAttribute_2_4(
@@ -488,8 +518,8 @@ void GraphicsComposerHidlTest::Test_setActiveConfigWithConstraints(const TestPar
IComposerClient::VsyncPeriodChangeConstraints constraints = {
.desiredTimeNanos = systemTime() + params.delayForChange,
.seamlessRequired = false};
EXPECT_EQ(Error::NONE, mComposerClient->setActiveConfigWithConstraints(
display.get(), config2, constraints, &timeline));
EXPECT_EQ(Error::NONE,
setActiveConfigWithConstraints(display, config2, constraints, &timeline));
EXPECT_TRUE(timeline.newVsyncAppliedTimeNanos >= constraints.desiredTimeNanos);
// Refresh rate should change within a reasonable time