libhwc2.1: re-enable displaycolor

Bug: 186905324
Test: Boot to home
Test: Check color modes with mock calibration file
Change-Id: I7a81f9dd1bb7e3193cf76a4e0b3204e67cfc2511

6 files changed, 3 insertions, 25 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index b56feb9..812747a 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -53,7 +53,6 @@ ExynosDisplayDrmInterfaceModule::~ExynosDisplayDrmInterfaceModule()
 {
 }
 
-#if 0
 void ExynosDisplayDrmInterfaceModule::parseBpcEnums(const DrmProperty& property)
 {
     const std::vector<std::pair<uint32_t, const char *>> bpcEnums = {
@@ -748,7 +747,6 @@ uint32_t ExynosDisplayDrmInterfaceModule::SaveBlob::getBlob(uint32_t type)
     }
     return blobs[type];
 }
-#endif
 
 //////////////////////////////////////////////////// ExynosPrimaryDisplayDrmInterfaceModule //////////////////////////////////////////////////////////////////
 ExynosPrimaryDisplayDrmInterfaceModule::ExynosPrimaryDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay)
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index 0deae35..d1a3fd1 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -29,8 +29,7 @@ class ExynosDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface {
     public:
         ExynosDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay);
         virtual ~ExynosDisplayDrmInterfaceModule();
-#if 0
-        virtual void initDrmDevice(DrmDevice *drmDevice);
+        virtual int32_t initDrmDevice(DrmDevice *drmDevice);
 
         virtual int32_t setDisplayColorSetting(
                 ExynosDisplayDrmInterface::DrmModeAtomicReq &drmReq);
@@ -141,7 +140,6 @@ class ExynosDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface {
             BPC_10,
         };
         DrmPropertyMap mBpcEnums;
-#endif
 };
 
 class ExynosPrimaryDisplayDrmInterfaceModule : public ExynosDisplayDrmInterfaceModule {
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index fba6b88..4a8ef20 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -40,33 +40,25 @@ mpp_phycal_type_t getMPPTypeFromDPPChannel(uint32_t channel) {
 }
 
 using namespace gs101;
-#if 0
+
 // enable map layerDataMappingInfo comparison in needDisplayColorSetting()
 inline bool operator==(const ExynosPrimaryDisplayModule::DisplaySceneInfo::LayerMappingInfo &lm1,
                        const ExynosPrimaryDisplayModule::DisplaySceneInfo::LayerMappingInfo &lm2) {
     return lm1.dppIdx == lm2.dppIdx && lm1.planeId == lm2.planeId;
 }
-#endif
 
 ExynosPrimaryDisplayModule::ExynosPrimaryDisplayModule(uint32_t index, ExynosDevice *device)
-    :    ExynosPrimaryDisplay(index, device)/*, mDisplayColorLoader(DISPLAY_COLOR_LIB)*/
+    :    ExynosPrimaryDisplay(index, device), mDisplayColorLoader(DISPLAY_COLOR_LIB)
 {
 #ifdef FORCE_GPU_COMPOSITION
     exynosHWCControl.forceGpu = true;
 #endif
-
-#if 0
-    mDisplayColorInterface = mDisplayColorLoader.GetDisplayColorGS101(1);
-    mDisplaySceneInfo.displayScene.dpu_bit_depth = BitDepth::kTen;
-#endif
 }
 
-#if 0
 int ExynosPrimaryDisplayModule::initDisplayColor() {
     mDisplayColorInterface = mDisplayColorLoader.GetDisplayColorGS101(1);
     return mDisplayColorInterface == nullptr ? -EINVAL : NO_ERROR;
 }
-#endif
 
 ExynosPrimaryDisplayModule::~ExynosPrimaryDisplayModule () {
 }
@@ -133,7 +125,6 @@ void ExynosPrimaryDisplayModule::doPreProcessing() {
     }
 }
 
-#if 0
 int32_t ExynosPrimaryDisplayModule::getColorModes(
         uint32_t* outNumModes, int32_t* outModes)
 {
@@ -723,7 +714,6 @@ void ExynosPrimaryDisplayModule::DisplaySceneInfo::printLayerColorData(
         ALOGD("\ttm_knee_y(%d)", layerData.dynamic_metadata.tm_knee_y);
     }
 }
-#endif
 
 bool ExynosPrimaryDisplayModule::parseAtcProfile() {
     Json::Value root;
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 6874e91..24dedb8 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -102,7 +102,6 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
         void usePreDefinedWindow(bool use);
         virtual int32_t validateWinConfigData();
         void doPreProcessing();
-#if 0
         virtual int32_t getColorModes(
                 uint32_t* outNumModes,
                 int32_t* outModes);
@@ -115,14 +114,12 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
         virtual int deliverWinConfigData();
         virtual int32_t updateColorConversionInfo();
         virtual int32_t getColorAdjustedDbv(uint32_t &dbv_adj);
-#endif
 
         virtual void initLbe();
         virtual void setLbeState(LbeState state);
         virtual void setLbeAmbientLight(int value);
         virtual LbeState getLbeState();
 
-#if 0
         class DisplaySceneInfo {
             public:
                 struct LayerMappingInfo {
@@ -241,7 +238,6 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
         IDisplayColorGS101 *mDisplayColorInterface;
         DisplaySceneInfo mDisplaySceneInfo;
         DisplayColorLoader mDisplayColorLoader;
-#endif
 
         struct atc_lux_map {
             uint32_t lux;
diff --git a/libhwc2.1/libresource/ExynosMPPModule.cpp b/libhwc2.1/libresource/ExynosMPPModule.cpp
index efb44e9..4c0d9c3 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.cpp
+++ b/libhwc2.1/libresource/ExynosMPPModule.cpp
@@ -41,7 +41,6 @@ uint32_t ExynosMPPModule::getSrcXOffsetAlign(struct exynos_image &src)
     return mSrcSizeRestrictions[idx].cropXAlign;
 }
 
-#if 0
 int32_t ExynosMPPModule::setColorConversionInfo()
 {
     if (mAssignedDisplay == nullptr) {
@@ -81,4 +80,3 @@ int32_t ExynosMPPModule::setColorConversionInfo()
     }
     return NO_ERROR;
 }
-#endif
diff --git a/libhwc2.1/libresource/ExynosMPPModule.h b/libhwc2.1/libresource/ExynosMPPModule.h
index b6ec65c..4bcfa4b 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.h
+++ b/libhwc2.1/libresource/ExynosMPPModule.h
@@ -28,9 +28,7 @@ class ExynosMPPModule : public ExynosMPP {
             uint32_t physicalIndex, uint32_t logicalIndex, uint32_t preAssignInfo);
         ~ExynosMPPModule();
         virtual uint32_t getSrcXOffsetAlign(struct exynos_image &src);
-#if 0
         virtual int32_t setColorConversionInfo();
-#endif
     public:
         uint32_t mChipId;
 };