diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-25 23:45:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-25 23:45:21 +0000 |
| commit | 62db04ddf0d233b33e213265ae3e223dd3e53f06 (patch) | |
| tree | 6d2623abb73e7144e5904be2938d12506d8071c2 | |
| parent | a7bfd6bd39f85c35ae097e8902d7fcb3a38b4ff4 (diff) | |
| parent | 5795ae34a5a741b24d98c13a682037fee9653b2e (diff) | |
| download | zuma-62db04ddf0d233b33e213265ae3e223dd3e53f06.tar.gz | |
Merge "libhwc2.1: move getRefreshRate() out of class OperationRateManager" into udc-dev
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 9 | ||||
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index 587b94c..da18f85 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -80,11 +80,6 @@ int32_t ExynosPrimaryDisplayModule::OperationRateManager::setOperationRate(const return ret; } -int32_t ExynosPrimaryDisplayModule::OperationRateManager::getRefreshRate(const int32_t config_id) { - constexpr float nsecsPerSec = std::chrono::nanoseconds(1s).count(); - return round(nsecsPerSec / mDisplay->mDisplayConfigs[config_id].vsyncPeriod * 0.1f) * 10; -} - ExynosPrimaryDisplayModule::OperationRateManager::OperationRateManager( ExynosPrimaryDisplay* display, int32_t hsHz, int32_t nsHz) : gs201::ExynosPrimaryDisplayModule::OperationRateManager(), @@ -122,7 +117,7 @@ int32_t ExynosPrimaryDisplayModule::OperationRateManager::onLowPowerMode(bool en int32_t ExynosPrimaryDisplayModule::OperationRateManager::onConfig(hwc2_config_t cfg) { Mutex::Autolock lock(mLock); - mDisplayRefreshRate = getRefreshRate(cfg); + mDisplayRefreshRate = mDisplay->getRefreshRate(cfg); OP_MANAGER_LOGD("rate=%d", mDisplayRefreshRate); updateOperationRateLocked(DispOpCondition::SET_CONFIG); return 0; @@ -164,7 +159,7 @@ int32_t ExynosPrimaryDisplayModule::OperationRateManager::updateOperationRateLoc } int32_t desiredOpRate = mDisplayHsOperationRate; - int32_t curRefreshRate = getRefreshRate(mDisplay->mActiveConfig); + int32_t curRefreshRate = mDisplay->getRefreshRate(mDisplay->mActiveConfig); bool isSteadyLowRefreshRate = (mDisplayPeakRefreshRate && mDisplayPeakRefreshRate <= mDisplayNsOperationRate) || mDisplayLowBatteryModeEnabled; diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h index 717964f..7aeaf04 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -54,7 +54,6 @@ class ExynosPrimaryDisplayModule : public gs201::ExynosPrimaryDisplayModule { int32_t updateOperationRateLocked(const DispOpCondition cond); int32_t setOperationRate(const int32_t rate); - int32_t getRefreshRate(const int32_t config_id); ExynosPrimaryDisplay* mDisplay; int32_t mDisplayHsOperationRate; |