diff options
author | Jeremy DeHaan <jdehaan@google.com> | 2022-06-01 21:36:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-01 21:36:43 +0000 |
commit | 7ac85d696a5eb27bfe249413f563673dee40b78f (patch) | |
tree | ff84bb76a2ae6308e501535f73387eb43220fb14 | |
parent | 64d79a8c4ef40f1c2e551b73b3efb1b91ecfa01b (diff) | |
parent | e8ad90586d15ed1380f41d6706d02a1b8ed34f05 (diff) | |
download | gs101-7ac85d696a5eb27bfe249413f563673dee40b78f.tar.gz |
libhwc2.1: determine panel calibration status am: e8ad90586d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/18606872
Change-Id: Id2a029c956a18abb24bdcac52fb007bf66d77c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 18 | ||||
-rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index a8425c4..a6ec3c1 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -1058,6 +1058,24 @@ LbeState ExynosPrimaryDisplayModule::getLbeState() { return mCurrentLbeState; } +PanelCalibrationStatus ExynosPrimaryDisplayModule::getPanelCalibrationStatus() { + auto displayColorInterface = getDisplayColorInterface(); + if (displayColorInterface == nullptr) { + return PanelCalibrationStatus::UNCALIBRATED; + } + + auto displayType = getBuiltInDisplayType(); + auto calibrationInfo = displayColorInterface->GetCalibrationInfo(displayType); + + if (calibrationInfo.factory_cal_loaded) { + return PanelCalibrationStatus::ORIGINAL; + } else if (calibrationInfo.golden_cal_loaded) { + return PanelCalibrationStatus::GOLDEN; + } else { + return PanelCalibrationStatus::UNCALIBRATED; + } +} + int32_t ExynosPrimaryDisplayModule::setAtcStDimming(uint32_t value) { Mutex::Autolock lock(mAtcStMutex); int32_t strength = mAtcStrength.value.get(); diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h index 8489f28..ada69f6 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -134,6 +134,8 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay { virtual void setLbeAmbientLight(int value); virtual LbeState getLbeState(); + virtual PanelCalibrationStatus getPanelCalibrationStatus(); + class DisplaySceneInfo { public: struct LayerMappingInfo { |