libhwc2.1: Apply namespace gs101

To support SoC variations, it requires namespace separation.
This commit encloses class codes and globals with namespace gs101.
And gs101 codes will be used as base implementations for all
SoC variations.

Bug: 197942811
Test: device boot and suspend/resume work
Signed-off-by: YongWook Shin <yongwook.shin@samsung.com>
Change-Id: I5aa8b20cf351c291ed42d1d8b4cd343040210e4a
Merged-In: I5aa8b20cf351c291ed42d1d8b4cd343040210e4a

17 files changed, 53 insertions, 5 deletions

diff --git a/libhwc2.1/DeconHeader.h b/libhwc2.1/DeconHeader.h
index 327a5fb..6892c0e 100644
--- a/libhwc2.1/DeconHeader.h
+++ b/libhwc2.1/DeconHeader.h
@@ -27,4 +27,5 @@ enum decon_idma_type {
   ODMA_WB,
   MAX_DECON_DMA_TYPE,
 };
+
 #endif
diff --git a/libhwc2.1/ExynosResourceRestriction.h b/libhwc2.1/ExynosResourceRestriction.h
index 7b6fd8b..bcb15ef 100644
--- a/libhwc2.1/ExynosResourceRestriction.h
+++ b/libhwc2.1/ExynosResourceRestriction.h
@@ -18,6 +18,7 @@
 #define EXYNOS_RESOURCE_RESTRICTION_H_
 
 #include "ExynosHWCModule.h"
+
 /*******************************************************************
  * Structures for restrictions
  * ****************************************************************/
diff --git a/libhwc2.1/libdevice/ExynosDeviceModule.cpp b/libhwc2.1/libdevice/ExynosDeviceModule.cpp
index 39b7ac4..202ae23 100644
--- a/libhwc2.1/libdevice/ExynosDeviceModule.cpp
+++ b/libhwc2.1/libdevice/ExynosDeviceModule.cpp
@@ -17,6 +17,9 @@
 #include "ExynosDeviceModule.h"
 
 extern struct exynos_hwc_control exynosHWCControl;
+
+using namespace gs101;
+
 ExynosDeviceModule::ExynosDeviceModule()
     : ExynosDevice()
 {
diff --git a/libhwc2.1/libdevice/ExynosDeviceModule.h b/libhwc2.1/libdevice/ExynosDeviceModule.h
index 478f145..47523d5 100644
--- a/libhwc2.1/libdevice/ExynosDeviceModule.h
+++ b/libhwc2.1/libdevice/ExynosDeviceModule.h
@@ -19,6 +19,8 @@
 
 #include "ExynosDevice.h"
 
+namespace gs101 {
+
 class ExynosDeviceModule : public ExynosDevice {
     public:
         ExynosDeviceModule();
@@ -26,4 +28,6 @@ class ExynosDeviceModule : public ExynosDevice {
 
 };
 
+}  // namespace gs101
+
 #endif
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index b68f448..9156338 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -41,6 +41,8 @@ int32_t convertDqeMatrixDataToMatrix(T &colorMatrix, M &mat,
     return NO_ERROR;
 }
 
+using namespace gs101;
+
 /////////////////////////////////////////////////// ExynosDisplayDrmInterfaceModule //////////////////////////////////////////////////////////////////
 ExynosDisplayDrmInterfaceModule::ExynosDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay)
 : ExynosDisplayDrmInterface(exynosDisplay)
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index 36efc8c..55671c4 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -21,6 +21,8 @@
 
 #include "ExynosDisplayDrmInterface.h"
 
+namespace gs101 {
+
 using namespace displaycolor;
 
 class ExynosDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface {
@@ -154,4 +156,7 @@ class ExynosExternalDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface
         ExynosExternalDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay);
         virtual ~ExynosExternalDisplayDrmInterfaceModule();
 };
+
+}  // namespace gs101
+
 #endif
diff --git a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
index 6c103a3..7b3be9f 100644
--- a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
+++ b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
@@ -26,6 +26,8 @@
 
 #define SKIP_FRAME_COUNT        3
 
+using namespace gs101;
+
 ExynosExternalDisplayModule::ExynosExternalDisplayModule(uint32_t index, ExynosDevice *device)
     :    ExynosExternalDisplay(index, device)
 {
diff --git a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
index ff36c28..d2db8e6 100644
--- a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
+++ b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
@@ -19,6 +19,8 @@
 #include "ExynosDisplay.h"
 #include "ExynosExternalDisplay.h"
 
+namespace gs101 {
+
 class ExynosExternalDisplayModule : public ExynosExternalDisplay {
     public:
         ExynosExternalDisplayModule(uint32_t index, ExynosDevice *device);
@@ -26,4 +28,6 @@ class ExynosExternalDisplayModule : public ExynosExternalDisplay {
         virtual int32_t validateWinConfigData();
 };
 
+}  // namespace gs101
+
 #endif
diff --git a/libhwc2.1/libmaindisplay/DisplayColorLoader.h b/libhwc2.1/libmaindisplay/DisplayColorLoader.h
index 95eaffe..316884c 100644
--- a/libhwc2.1/libmaindisplay/DisplayColorLoader.h
+++ b/libhwc2.1/libmaindisplay/DisplayColorLoader.h
@@ -22,6 +22,8 @@
 #include <log/log.h>
 #include <string>
 
+namespace gs101 {
+
 class DisplayColorLoader {
     public:
       DisplayColorLoader(const char *lib_name) {
@@ -59,4 +61,6 @@ class DisplayColorLoader {
       displaycolor::IDisplayColorGS101* (*get_display_color_gs101)(size_t);
 };
 
+}  // namespace gs101
+
 #endif //DISPLAY_COLOR_LOADER_H
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 4f3ea81..a963826 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -39,11 +39,7 @@ mpp_phycal_type_t getMPPTypeFromDPPChannel(uint32_t channel) {
     return MPP_P_TYPE_MAX;
 }
 
-// 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;
-}
+using namespace gs101;
 
 ExynosPrimaryDisplayModule::ExynosPrimaryDisplayModule(uint32_t index, ExynosDevice *device)
     :    ExynosPrimaryDisplay(index, device), mDisplayColorLoader(DISPLAY_COLOR_LIB)
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 1b80d2c..9fdf540 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -91,6 +91,8 @@ const std::unordered_map<std::string, std::string> kAtcSubSetting =
          {"gain_limit", ATC_GAIN_LIMIT_FILE_NAME},
          {"lt_calc_ab_shift", ATC_LT_CALC_AB_SHIFT_FILE_NAME}};
 
+namespace gs101 {
+
 using namespace displaycolor;
 
 class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
@@ -125,6 +127,10 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
         class DisplaySceneInfo {
             public:
                 struct LayerMappingInfo {
+                    bool operator==(const LayerMappingInfo &rhs) const {
+                        return ((dppIdx == rhs.dppIdx) && (planeId == rhs.planeId));
+                    }
+
                     // index in DisplayScene::layer_data
                     uint32_t dppIdx;
                     // assigned drm plane id in last color setting update
@@ -284,4 +290,6 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
         bool mPendingAtcOff;
 };
 
+}  // namespace gs101
+
 #endif
diff --git a/libhwc2.1/libresource/ExynosMPPModule.cpp b/libhwc2.1/libresource/ExynosMPPModule.cpp
index 504c02d..4c0d9c3 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.cpp
+++ b/libhwc2.1/libresource/ExynosMPPModule.cpp
@@ -19,6 +19,8 @@
 #include "ExynosResourceManager.h"
 #include "ExynosPrimaryDisplayModule.h"
 
+using namespace gs101;
+
 ExynosMPPModule::ExynosMPPModule(ExynosResourceManager* resourceManager,
         uint32_t physicalType, uint32_t logicalType, const char *name,
         uint32_t physicalIndex, uint32_t logicalIndex, uint32_t preAssignInfo)
diff --git a/libhwc2.1/libresource/ExynosMPPModule.h b/libhwc2.1/libresource/ExynosMPPModule.h
index e78d961..4bcfa4b 100644
--- a/libhwc2.1/libresource/ExynosMPPModule.h
+++ b/libhwc2.1/libresource/ExynosMPPModule.h
@@ -20,6 +20,8 @@
 
 #define MAX_DPP_ROT_SRC_SIZE (3040*1440)
 
+namespace gs101 {
+
 class ExynosMPPModule : public ExynosMPP {
     public:
         ExynosMPPModule(ExynosResourceManager* resourceManager, uint32_t physicalType, uint32_t logicalType, const char *name,
@@ -31,4 +33,6 @@ class ExynosMPPModule : public ExynosMPP {
         uint32_t mChipId;
 };
 
+}  // namespace gs101
+
 #endif
diff --git a/libhwc2.1/libresource/ExynosResourceManagerModule.cpp b/libhwc2.1/libresource/ExynosResourceManagerModule.cpp
index 365ad48..6c6cc83 100644
--- a/libhwc2.1/libresource/ExynosResourceManagerModule.cpp
+++ b/libhwc2.1/libresource/ExynosResourceManagerModule.cpp
@@ -17,6 +17,8 @@
 #include "ExynosMPPModule.h"
 #define CHIP_ID_PATH "/sys/devices/system/chip-id/revision"
 
+using namespace gs101;
+
 ExynosResourceManagerModule::ExynosResourceManagerModule(ExynosDevice* device)
         : ExynosResourceManager(device)
 {
diff --git a/libhwc2.1/libresource/ExynosResourceManagerModule.h b/libhwc2.1/libresource/ExynosResourceManagerModule.h
index 19da403..addbd7b 100644
--- a/libhwc2.1/libresource/ExynosResourceManagerModule.h
+++ b/libhwc2.1/libresource/ExynosResourceManagerModule.h
@@ -18,10 +18,14 @@
 
 #include "ExynosResourceManager.h"
 
+namespace gs101 {
+
 class ExynosResourceManagerModule : public ExynosResourceManager {
     public:
         ExynosResourceManagerModule(ExynosDevice* device);
         ~ExynosResourceManagerModule();
 };
 
+}  // namespace gs101
+
 #endif // _EXYNOS_RESOURCE_MANAGER_MODULE_H
diff --git a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.cpp b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.cpp
index a8d209d..a74312b 100644
--- a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.cpp
+++ b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.cpp
@@ -18,6 +18,8 @@
 
 #include "ExynosVirtualDisplayModule.h"
 
+using namespace gs101;
+
 ExynosVirtualDisplayModule::ExynosVirtualDisplayModule(uint32_t index, ExynosDevice *device)
     :   ExynosVirtualDisplay(index, device)
 {
diff --git a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.h b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.h
index 398441b..9d68c2d 100644
--- a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.h
+++ b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplayModule.h
@@ -19,6 +19,8 @@
 #include "ExynosDisplay.h"
 #include "ExynosVirtualDisplay.h"
 
+namespace gs101 {
+
 class ExynosVirtualDisplayModule : public ExynosVirtualDisplay {
 public:
     ExynosVirtualDisplayModule(uint32_t displayId, ExynosDevice *device);
@@ -33,4 +35,6 @@ public:
             int32_t /*hwc2_attribute_t*/ attribute, int32_t* outValue);
 };
 
+}
+
 #endif