SF: Remove per-display state in scheduler
This CL removes per-display RefreshRateConfigs and AllowedDisplayConfigs
to avoid bugs in the untested multi-display code path of the scheduler,
adds checks to prevent crashes if the internal display is removed, and
cleans up related code by:
1) Replacing AllowedDisplayConfigs with a simple set.
2) Making setAllowedDisplayConfigs consistent with setPowerMode.
3) Removing unnecessary locking and allocation.
Bug: 129433906
Test: Boot with single/multiple display(s)
Change-Id: I3f59e9bdeaceb2cf48b4b9b71cd27f1d6a574680
(cherry picked from commit 645365116b7c77204aaffbb88f9407549445396c)
diff --git a/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp b/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp
index b218ad6..8b37c22 100644
--- a/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp
+++ b/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp
@@ -49,6 +49,8 @@
ASSERT_EQ(left.name, right.name);
ASSERT_EQ(left.fps, right.fps);
}
+
+ RefreshRateConfigs mConfigs;
};
RefreshRateConfigsTest::RefreshRateConfigsTest() {
@@ -69,10 +71,10 @@
*/
TEST_F(RefreshRateConfigsTest, zeroDeviceConfigs_storesPowerSavingConfig) {
std::vector<std::shared_ptr<const HWC2::Display::Config>> displayConfigs;
- RefreshRateConfigs configs(displayConfigs);
+ mConfigs.populate(displayConfigs);
// We always store a configuration for screen off.
- const auto& rates = configs.getRefreshRates();
+ const auto& rates = mConfigs.getRefreshRates();
ASSERT_EQ(1, rates.size());
const auto& powerSavingRate = rates.find(RefreshRateType::POWER_SAVING);
ASSERT_NE(rates.end(), powerSavingRate);
@@ -82,13 +84,13 @@
RefreshRate expectedConfig = RefreshRate{SCREEN_OFF_CONFIG_ID, "ScreenOff", 0};
assertRatesEqual(expectedConfig, *powerSavingRate->second);
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::POWER_SAVING));
- assertRatesEqual(expectedConfig, *configs.getRefreshRate(RefreshRateType::POWER_SAVING));
- ASSERT_FALSE(configs.getRefreshRate(RefreshRateType::PERFORMANCE));
- ASSERT_FALSE(configs.getRefreshRate(RefreshRateType::DEFAULT));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ assertRatesEqual(expectedConfig, *mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ ASSERT_FALSE(mConfigs.getRefreshRate(RefreshRateType::PERFORMANCE));
+ ASSERT_FALSE(mConfigs.getRefreshRate(RefreshRateType::DEFAULT));
// Sanity check that getRefreshRate() does not modify the underlying configs.
- ASSERT_EQ(1, configs.getRefreshRates().size());
+ ASSERT_EQ(1, mConfigs.getRefreshRates().size());
}
TEST_F(RefreshRateConfigsTest, oneDeviceConfig_storesDefaultConfig) {
@@ -97,9 +99,9 @@
auto config60 = HWC2::Display::Config::Builder(*display, CONFIG_ID_60);
config60.setVsyncPeriod(VSYNC_60);
displayConfigs.push_back(config60.build());
- RefreshRateConfigs configs(displayConfigs);
+ mConfigs.populate(displayConfigs);
- const auto& rates = configs.getRefreshRates();
+ const auto& rates = mConfigs.getRefreshRates();
ASSERT_EQ(2, rates.size());
const auto& powerSavingRate = rates.find(RefreshRateType::POWER_SAVING);
const auto& defaultRate = rates.find(RefreshRateType::DEFAULT);
@@ -112,15 +114,15 @@
RefreshRate expectedDefaultConfig = RefreshRate{CONFIG_ID_60, "60fps", 60};
assertRatesEqual(expectedDefaultConfig, *defaultRate->second);
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
assertRatesEqual(expectedPowerSavingConfig,
- *configs.getRefreshRate(RefreshRateType::POWER_SAVING));
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::DEFAULT));
- assertRatesEqual(expectedDefaultConfig, *configs.getRefreshRate(RefreshRateType::DEFAULT));
- ASSERT_FALSE(configs.getRefreshRate(RefreshRateType::PERFORMANCE));
+ *mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::DEFAULT));
+ assertRatesEqual(expectedDefaultConfig, *mConfigs.getRefreshRate(RefreshRateType::DEFAULT));
+ ASSERT_FALSE(mConfigs.getRefreshRate(RefreshRateType::PERFORMANCE));
// Sanity check that getRefreshRate() does not modify the underlying configs.
- ASSERT_EQ(2, configs.getRefreshRates().size());
+ ASSERT_EQ(2, mConfigs.getRefreshRates().size());
}
TEST_F(RefreshRateConfigsTest, twoDeviceConfigs_storesPerformanceConfig) {
@@ -132,9 +134,9 @@
auto config90 = HWC2::Display::Config::Builder(*display, CONFIG_ID_90);
config90.setVsyncPeriod(VSYNC_90);
displayConfigs.push_back(config90.build());
- RefreshRateConfigs configs(displayConfigs);
+ mConfigs.populate(displayConfigs);
- const auto& rates = configs.getRefreshRates();
+ const auto& rates = mConfigs.getRefreshRates();
ASSERT_EQ(3, rates.size());
const auto& powerSavingRate = rates.find(RefreshRateType::POWER_SAVING);
const auto& defaultRate = rates.find(RefreshRateType::DEFAULT);
@@ -150,14 +152,14 @@
RefreshRate expectedPerformanceConfig = RefreshRate{CONFIG_ID_90, "90fps", 90};
assertRatesEqual(expectedPerformanceConfig, *performanceRate->second);
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
assertRatesEqual(expectedPowerSavingConfig,
- *configs.getRefreshRate(RefreshRateType::POWER_SAVING));
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::DEFAULT));
- assertRatesEqual(expectedDefaultConfig, *configs.getRefreshRate(RefreshRateType::DEFAULT));
- ASSERT_TRUE(configs.getRefreshRate(RefreshRateType::PERFORMANCE));
+ *mConfigs.getRefreshRate(RefreshRateType::POWER_SAVING));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::DEFAULT));
+ assertRatesEqual(expectedDefaultConfig, *mConfigs.getRefreshRate(RefreshRateType::DEFAULT));
+ ASSERT_TRUE(mConfigs.getRefreshRate(RefreshRateType::PERFORMANCE));
assertRatesEqual(expectedPerformanceConfig,
- *configs.getRefreshRate(RefreshRateType::PERFORMANCE));
+ *mConfigs.getRefreshRate(RefreshRateType::PERFORMANCE));
}
} // namespace
} // namespace scheduler