diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-04-26 00:18:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-26 00:18:34 +0000 |
| commit | ac2244a3bb63910006021ed3eaf3b78bd6bf6ecb (patch) | |
| tree | 01e468851d995a6388707636f8371e0132471f45 | |
| parent | 6dbb41fc34791f00890d5bba0647afed7dc4aa07 (diff) | |
| parent | 62db04ddf0d233b33e213265ae3e223dd3e53f06 (diff) | |
| download | zuma-ac2244a3bb63910006021ed3eaf3b78bd6bf6ecb.tar.gz | |
Merge "libhwc2.1: move getRefreshRate() out of class OperationRateManager" into udc-dev am: 62db04ddf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/zuma/+/22539519
Change-Id: Icce6cc2a0bde14017900a406261a232ccf71705a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 d29b7d4..48e8654 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 faf6d8f..b084b6c 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -55,7 +55,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; |