summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-26 23:27:15 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-26 23:27:15 +0000
commitc99dd3901df44f5fbb9638c78342d5386082a7d7 (patch)
tree01e468851d995a6388707636f8371e0132471f45
parent8b1b8c2d955334618490773c9efdff9656ec7135 (diff)
parentac2244a3bb63910006021ed3eaf3b78bd6bf6ecb (diff)
downloadzuma-c99dd3901df44f5fbb9638c78342d5386082a7d7.tar.gz
Snap for 10018787 from ac2244a3bb63910006021ed3eaf3b78bd6bf6ecb to udc-d1-release
Change-Id: I09d2ab8789642a8619127a55f6965b9af8905580
-rw-r--r--libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp9
-rw-r--r--libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h1
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;