diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-29 03:15:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-29 03:15:46 +0000 |
| commit | 547941f5f989be58039e23238b4921c1edb18f59 (patch) | |
| tree | 2d825a78dca28c73dcb82235884a0bef1c4f5b3f /libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp | |
| parent | 3eabd5ccc79b1ae2b6e3b87990835639911ea678 (diff) | |
| parent | cf3f80275bcb0cdb46f9bd5a509c0c1ec9d1fc66 (diff) | |
Merge "Revert "libhwc2.1: LHBM On Constraint"" into sc-dev am: cf3f80275b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/15389252
Change-Id: I9b987d49691c41b172ebf86a0333e2f4066b73a4
Diffstat (limited to 'libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp')
| -rw-r--r-- | libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp index 57d79b4..4ecca66 100644 --- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp +++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp @@ -699,13 +699,6 @@ int32_t ExynosDisplayDrmInterface::setLowPowerMode() { // Dots per 1000 inches mExynosDisplay->mYdpi = mm_height ? (mDozeDrmMode.v_display() * kUmPerInch) / mm_height : -1; - // force to turn off lhbm - if (mBrightnessCtrl.LhbmOn.get() == true) { - mExynosDisplay->clearReqLhbm(); - mExynosDisplay->updateBrightnessState(); - mLhbmForceUpdated = true; - } - return setActiveDrmMode(mDozeDrmMode); } @@ -798,7 +791,6 @@ int32_t ExynosDisplayDrmInterface::getDisplayConfigs( /* key: (width<<32 | height) */ std::map<uint64_t, uint32_t> groupIds; uint32_t groupId = 0; - uint32_t min_vsync_period = UINT_MAX; for (const DrmMode &mode : mDrmConnector->modes()) { displayConfigs_t configs; @@ -818,14 +810,11 @@ int32_t ExynosDisplayDrmInterface::getDisplayConfigs( configs.Xdpi = mm_width ? (mode.h_display() * kUmPerInch) / mm_width : -1; // Dots per 1000 inches configs.Ydpi = mm_height ? (mode.v_display() * kUmPerInch) / mm_height : -1; - // find min vsync period - if (configs.vsyncPeriod <= min_vsync_period) min_vsync_period = configs.vsyncPeriod; mExynosDisplay->mDisplayConfigs.insert(std::make_pair(mode.id(), configs)); ALOGD("config group(%d), w(%d), h(%d), vsync(%d), xdpi(%d), ydpi(%d)", configs.groupId, configs.width, configs.height, configs.vsyncPeriod, configs.Xdpi, configs.Ydpi); } - mExynosDisplay->setMinDisplayVsyncPeriod(min_vsync_period); } uint32_t num_modes = static_cast<uint32_t>(mDrmConnector->modes().size()); @@ -1044,18 +1033,6 @@ int32_t ExynosDisplayDrmInterface::setActiveDrmMode(DrmMode const &mode) { DrmModeAtomicReq drmReq(this); - if (mLhbmForceUpdated) { - if (mBrightnessCtrl.LhbmOn.is_dirty()) { - if ((ret = drmReq.atomicAddProperty(mDrmConnector->id(), mDrmConnector->lhbm_on(), - mBrightnessCtrl.LhbmOn.get())) < 0) { - HWC_LOGE(mExynosDisplay, "%s: Fail to set lhbm_on property", __func__); - } - mBrightnessCtrl.LhbmOn.clear_dirty(); - mExynosDisplay->notifyLhbmState(mBrightnessCtrl.LhbmOn.get()); - } - mLhbmForceUpdated = false; - } - if ((ret = setDisplayMode(drmReq, modeBlob)) != NO_ERROR) { drmReq.addOldBlob(modeBlob); HWC_LOGE(mExynosDisplay, "%s: Fail to apply display mode", |