libhwc2.1: load displaycolor after init drm device

Display driver is in fully ready status after setActiveConfig which has
been called during drm device initialization.

Bug: 186446401
Test: reboot and no failed reading panel serial in displaycolor log
Change-Id: Ic0420446a1769dacb9fc7fcd847faa9bcfbc081f

3 files changed, 13 insertions, 1 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 27503da..e90eaa5 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -79,6 +79,13 @@ int32_t ExynosDisplayDrmInterfaceModule::initDrmDevice(DrmDevice *drmDevice)
 
     ExynosPrimaryDisplayModule* display =
         (ExynosPrimaryDisplayModule*)mExynosDisplay;
+
+    ret = display->initDisplayColor();
+    if (ret != NO_ERROR) {
+        HWC_LOGE(mExynosDisplay, "Failed to load displaycolor %d", ret);
+        return ret;
+    }
+
     size_t dppSize = display->getNumOfDpp();
     resizeOldDppBlobs(dppSize);
     if (mDrmCrtc->force_bpc_property().id())
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 1e7fb56..3a95617 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -50,10 +50,14 @@ ExynosPrimaryDisplayModule::ExynosPrimaryDisplayModule(uint32_t index, ExynosDev
     exynosHWCControl.forceGpu = true;
 #endif
 
-    mDisplayColorInterface = mDisplayColorLoader.GetDisplayColorGS101(1);
     mDisplaySceneInfo.displayScene.dpu_bit_depth = BitDepth::kTen;
 }
 
+int ExynosPrimaryDisplayModule::initDisplayColor() {
+    mDisplayColorInterface = mDisplayColorLoader.GetDisplayColorGS101(1);
+    return mDisplayColorInterface == nullptr ? -EINVAL : NO_ERROR;
+}
+
 ExynosPrimaryDisplayModule::~ExynosPrimaryDisplayModule () {
 }
 
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 34ffc95..de63f03 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -199,6 +199,7 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
                 void printLayerColorData(const LayerColorData& layerData);
         };
 
+        int initDisplayColor();
         /* Call getDppForLayer() only if hasDppForLayer() is true */
         bool hasDppForLayer(ExynosMPPSource* layer);
         const IDisplayColorGS101::IDpp& getDppForLayer(ExynosMPPSource* layer);