1 files changed, 9 insertions, 7 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
index 994027a..ebf45f5 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
@@ -32,6 +32,7 @@
 #include "ExynosHWCHelper.h"
 
 using namespace std::chrono_literals;
+using namespace SOC_VERSION;
 
 constexpr uint32_t MAX_PLANE_NUM = 3;
 constexpr uint32_t CBCR_INDEX = 1;
@@ -447,6 +448,7 @@ ExynosDisplayDrmInterface::~ExynosDisplayDrmInterface()
 void ExynosDisplayDrmInterface::init(ExynosDisplay *exynosDisplay)
 {
     mExynosDisplay = exynosDisplay;
+    mDisplayTraceName = mExynosDisplay->mDisplayTraceName;
     mDrmDevice = NULL;
     mDrmCrtc = NULL;
     mDrmConnector = NULL;
@@ -661,7 +663,7 @@ int32_t ExynosDisplayDrmInterface::initDrmDevice(DrmDevice *drmDevice)
 
     getLowPowerDrmModeModeInfo();
 
-    mDrmVSyncWorker.Init(mDrmDevice, drmDisplayId);
+    mDrmVSyncWorker.Init(mDrmDevice, drmDisplayId, mDisplayTraceName);
     mDrmVSyncWorker.RegisterCallback(std::shared_ptr<VsyncCallback>(this));
 
     if (!mDrmDevice->planes().empty()) {
@@ -721,7 +723,7 @@ void ExynosDisplayDrmInterface::Callback(
 
     if (exynosDevice->onVsync_2_4(mExynosDisplay->mDisplayId, timestamp,
                                   mExynosDisplay->mVsyncPeriod)) {
-        ATRACE_INT(vsyncPeriodTag, static_cast<int32_t>(mExynosDisplay->mVsyncPeriod));
+        DISPLAY_ATRACE_INT(vsyncPeriodTag, static_cast<int32_t>(mExynosDisplay->mVsyncPeriod));
         return;
     }
 
@@ -819,7 +821,7 @@ int32_t ExynosDisplayDrmInterface::setVsyncEnabled(uint32_t enabled)
 
     ExynosDevice *exynosDevice = mExynosDisplay->mDevice;
     if (exynosDevice->isCallbackAvailable(HWC2_CALLBACK_VSYNC_2_4)) {
-        ATRACE_INT(vsyncPeriodTag, 0);
+        DISPLAY_ATRACE_INT(vsyncPeriodTag, 0);
     }
 
     return NO_ERROR;
@@ -1360,11 +1362,11 @@ int32_t ExynosDisplayDrmInterface::updateHdrCapabilities()
 
 int ExynosDisplayDrmInterface::getDeconChannel(ExynosMPP *otfMPP)
 {
-    int32_t channelNum = sizeof(IDMA_CHANNEL_MAP)/sizeof(dpp_channel_map_t);
+    int32_t channelNum = sizeof(idma_channel_map)/sizeof(dpp_channel_map_t);
     for (int i = 0; i < channelNum; i++) {
-        if((IDMA_CHANNEL_MAP[i].type == otfMPP->mPhysicalType) &&
-           (IDMA_CHANNEL_MAP[i].index == otfMPP->mPhysicalIndex))
-            return IDMA_CHANNEL_MAP[i].channel;
+        if((idma_channel_map[i].type == otfMPP->mPhysicalType) &&
+           (idma_channel_map[i].index == otfMPP->mPhysicalIndex))
+            return idma_channel_map[i].channel;
     }
     return -EINVAL;
 }