[HACK] libhwc2.1: Remove code for libdisplaycolor

This commit should be used for only Home screen bring-up.

Bug: 197942811
Test: device boot and suspend/resume work
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I3a7b6e3ac94eafd4df2cd79fcdc9768a67e71c16
Merged-In: I3a7b6e3ac94eafd4df2cd79fcdc9768a67e71c16

6 files changed, 28 insertions, 2 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 569f656..842ee35 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -53,6 +53,7 @@ ExynosDisplayDrmInterfaceModule::~ExynosDisplayDrmInterfaceModule()
 {
 }
 
+#if 0
 void ExynosDisplayDrmInterfaceModule::parseBpcEnums(const DrmProperty& property)
 {
     const std::vector<std::pair<uint32_t, const char *>> bpcEnums = {
@@ -765,6 +766,7 @@ 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 55671c4..29d3ac8 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -29,7 +29,8 @@ class ExynosDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface {
     public:
         ExynosDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay);
         virtual ~ExynosDisplayDrmInterfaceModule();
-        virtual int32_t initDrmDevice(DrmDevice *drmDevice);
+#if 0
+        virtual void initDrmDevice(DrmDevice *drmDevice);
 
         virtual int32_t setDisplayColorSetting(
                 ExynosDisplayDrmInterface::DrmModeAtomicReq &drmReq);
@@ -143,6 +144,7 @@ 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 11de58e..754c291 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -40,17 +40,28 @@ 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(
         const std::vector<displaycolor::DisplayInfo>& display_info) {
     mDisplayColorInterface = mDisplayColorLoader.GetDisplayColorGS101(display_info);
@@ -60,6 +71,7 @@ int ExynosPrimaryDisplayModule::initDisplayColor(
 
     return NO_ERROR;
 }
+#endif
 
 ExynosPrimaryDisplayModule::~ExynosPrimaryDisplayModule () {
 }
@@ -126,6 +138,7 @@ void ExynosPrimaryDisplayModule::doPreProcessing() {
     }
 }
 
+#if 0
 int32_t ExynosPrimaryDisplayModule::getColorModes(
         uint32_t* outNumModes, int32_t* outModes)
 {
@@ -772,6 +785,7 @@ 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 2a1acd3..c26cbf2 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -102,6 +102,7 @@ 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);
@@ -118,12 +119,14 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
             return mDisplayColorInterface->IsRrCompensationEnabled(DisplayType::DISPLAY_PRIMARY);
         }
         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 {
@@ -245,6 +248,7 @@ 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 bc435ad..fa13372 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.cpp
+++ b/libhwc2.1/libresource/ExynosMPPModule.cpp
@@ -41,6 +41,7 @@ uint32_t ExynosMPPModule::getSrcXOffsetAlign(struct exynos_image &src)
     return mSrcSizeRestrictions[idx].cropXAlign;
 }
 
+#if 0
 int32_t ExynosMPPModule::setColorConversionInfo()
 {
     if (mAssignedDisplay == nullptr) {
@@ -84,3 +85,4 @@ int32_t ExynosMPPModule::setColorConversionInfo()
     }
     return NO_ERROR;
 }
+#endif
diff --git a/libhwc2.1/libresource/ExynosMPPModule.h b/libhwc2.1/libresource/ExynosMPPModule.h
index 4bcfa4b..b6ec65c 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.h
+++ b/libhwc2.1/libresource/ExynosMPPModule.h
@@ -28,7 +28,9 @@ 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;
 };