From 0d6780076377eeb7ee8c75b4d87879ebf7a01952 Mon Sep 17 00:00:00 2001
From: Tellen Yu<tellen.yu@amlogic.com>
Date: Mon, 17  Apr  2017  01:16:34  +0000
Subject: bringup o-pdk

Change-Id: Ia69a27ddd1399e6db426ac20bc1870086c992405
---
diff --git a/hwc2/common/base/HwcLayer.cpp b/hwc2/common/base/HwcLayer.cpp
index 4d8bb5f..8163478 100644
--- a/hwc2/common/base/HwcLayer.cpp
+++ b/hwc2/common/base/HwcLayer.cpp
@@ -35,7 +35,7 @@ HwcLayer::HwcLayer(hwc2_display_t& dpy)
       mAcquireFence(-1),
       mDataSpace(HAL_DATASPACE_UNKNOWN),
       mPlaneAlpha(0.0f),
-      mTransform(HAL_TRANSFORM_RESERVED),
+      mTransform(0),
       mZ(0),
       mBufferHnd(NULL),
       mInitialized(false)
diff --git a/hwc2/common/base/HwcModule.cpp b/hwc2/common/base/HwcModule.cpp
index 9b3a34b..5af1713 100644
--- a/hwc2/common/base/HwcModule.cpp
+++ b/hwc2/common/base/HwcModule.cpp
@@ -544,6 +544,8 @@ hwc2_function_pointer_t hwc2_getFunction(struct hwc2_device* device,
             return reinterpret_cast<hwc2_function_pointer_t>(getActiveConfig);
         case HWC2_FUNCTION_GET_CHANGED_COMPOSITION_TYPES:
             return reinterpret_cast<hwc2_function_pointer_t>(getChangedCompositionTypes);
+        case HWC2_FUNCTION_GET_CLIENT_TARGET_SUPPORT:
+            return reinterpret_cast<hwc2_function_pointer_t>(getClientTargetSupport);
         case HWC2_FUNCTION_GET_COLOR_MODES:
             return reinterpret_cast<hwc2_function_pointer_t>(getColorModes);
         case HWC2_FUNCTION_GET_DISPLAY_ATTRIBUTE:
diff --git a/hwc2/common/composers/GE2DComposer.cpp b/hwc2/common/composers/GE2DComposer.cpp
index ddaa229..591b495 100644
--- a/hwc2/common/composers/GE2DComposer.cpp
+++ b/hwc2/common/composers/GE2DComposer.cpp
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
+#include <cutils/atomic.h>
 
 namespace android {
 namespace amlogic {
diff --git a/hwc2/common/composers/GE2DComposer.h b/hwc2/common/composers/GE2DComposer.h
index 22d2f35..c71c115 100644
--- a/hwc2/common/composers/GE2DComposer.h
+++ b/hwc2/common/composers/GE2DComposer.h
@@ -22,7 +22,7 @@ public:
     LayerState()
     : mBufferHnd(NULL),
       mBlendMode(0),
-      mTransform(HAL_TRANSFORM_RESERVED),
+      mTransform(0),
       mBufferFd(-1) {
     }
 
diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp
index 5b1ccc8..c1563e4 100644
--- a/hwc2/common/devices/PhysicalDevice.cpp
+++ b/hwc2/common/devices/PhysicalDevice.cpp
@@ -1458,7 +1458,7 @@ int32_t PhysicalDevice::getLineValue(const char *lineStr, const char *magicStr)
         return 0;
     }
 
-    if (NULL != (pos = strstr(lineStr, magicStr))) {
+    if (NULL != (pos = strstr((char *)lineStr, magicStr))) {
         pos = pos + strlen(magicStr);
         char* start = pos;
         while (*start != '\n' && (strlen(start) > 0))
--
cgit