diff options
| author | Long Ling <longling@google.com> | 2021-05-11 18:54:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-11 18:54:38 +0000 |
| commit | 3474c2d9fc51d521db1cd00710fcb8ad726636cf (patch) | |
| tree | 7ed242efd39420ef4afe73cb215d58a16fd98115 /libhwc2.1/libmaindisplay | |
| parent | eebb5f379cd73f5c2a065ba3b64511a38f1a1034 (diff) | |
| parent | a81305445ccfee9d726f3cdf13f56112bdf9f5b6 (diff) | |
| download | gs101-3474c2d9fc51d521db1cd00710fcb8ad726636cf.tar.gz | |
Merge "libhwc2.1: lhbm compensation" into sc-dev
Diffstat (limited to 'libhwc2.1/libmaindisplay')
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 9 | ||||
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index fe6db14..4a98768 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -612,6 +612,8 @@ int32_t ExynosPrimaryDisplayModule::updateColorConversionInfo() : displaycolor::BrightnessMode::BM_NOMINAL; mDisplaySceneInfo.displayScene.force_hdr = getBrightnessState().dim_sdr_ratio != 1.0; + mDisplaySceneInfo.displayScene.lhbm_on = getBrightnessState().local_hbm; + mDisplaySceneInfo.displayScene.dbv = moduleDisplayInterface->getDbv(); if (hwcCheckDebugMessages(eDebugColorManagement)) mDisplaySceneInfo.printDisplayScene(); @@ -625,6 +627,13 @@ int32_t ExynosPrimaryDisplayModule::updateColorConversionInfo() return ret; } +int32_t ExynosPrimaryDisplayModule::getColorAdjustedDbv(uint32_t &dbv_adj) { + dbv_adj = mDisplayColorInterface->GetPipelineData(DisplayType::DISPLAY_PRIMARY) + ->Panel() + .GetAdjustedBrightnessLevel(); + return NO_ERROR; +} + bool ExynosPrimaryDisplayModule::DisplaySceneInfo::needDisplayColorSetting() { /* TODO: Check if we can skip color setting */ diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h index a3adc95..cb7056c 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -107,6 +107,7 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay { virtual int32_t setColorTransform(const float* matrix, int32_t hint); virtual int deliverWinConfigData(); virtual int32_t updateColorConversionInfo(); + virtual int32_t getColorAdjustedDbv(uint32_t &dbv_adj); virtual void initLbe(); virtual void setLbeState(LbeState state); |