Merge remote-tracking branch 'origin/master' into oreo-x86

Conflicts:
	Android.mk
	drmconnector.cpp
	drmeventlistener.cpp

diff --cc Android.mk
index 535ba0c,c0a1d0e..45bb3a2
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -78,11 -74,22 +78,25 @@@ LOCAL_SRC_FILES += drmhwctwo.cp
  LOCAL_CPPFLAGS += \
        -DHWC2_USE_CPP11 \
        -DHWC2_INCLUDE_STRINGIFICATION
 +else
 +LOCAL_SRC_FILES += hwcomposer.cpp
 +endif
  
+ 
+ ifeq ($(TARGET_PRODUCT),hikey960)
+ LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER
+ LOCAL_SRC_FILES += platformhisi.cpp
+ LOCAL_C_INCLUDES += device/linaro/hikey/gralloc960/
+ else ifeq ($(TARGET_PRODUCT),hikey)
+ LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER
+ LOCAL_SRC_FILES += platformhisi.cpp
+ LOCAL_C_INCLUDES += device/linaro/hikey/gralloc/
+ else ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),minigbm)
+ LOCAL_SRC_FILES += platformminigbm.cpp
+ LOCAL_C_INCLUDES += external/minigbm/cros_gralloc/
+ else
  LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER
+ endif
  
  LOCAL_MODULE := hwcomposer.drm
  LOCAL_MODULE_TAGS := optional

diff --cc drmconnector.cpp
index 1a536ef,10b96b5..04c81d4
--- 1/drmconnector.cpp
--- 2/drmconnector.cpp
+++ b/drmconnector.cpp
@@@ -22,8 -22,7 +22,8 @@@
  #include <errno.h>
  #include <stdint.h>
  
- #include <cutils/log.h>
+ #include <log/log.h>
 +#include <cutils/properties.h>
  #include <xf86drmMode.h>
  
  namespace android {

diff --cc drmdisplaycomposition.cpp
Simple merge

diff --cc drmdisplaycompositor.cpp
index 2f6939c,40af3be..60adbac
--- 1/drmdisplaycompositor.cpp
--- 2/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@@ -279,19 -221,14 +279,26 @@@ int DrmDisplayCompositor::Init(DrmResou
      ALOGE("Failed to initialize drm compositor lock %d\n", ret);
      return ret;
    }
 +  ret = worker_.Init();
 +  if (ret) {
 +    pthread_mutex_destroy(&lock_);
 +    ALOGE("Failed to initialize compositor worker %d\n", ret);
 +    return ret;
 +  }
 +  ret = frame_worker_.Init();
 +  if (ret) {
 +    pthread_mutex_destroy(&lock_);
 +    ALOGE("Failed to initialize frame worker %d\n", ret);
 +    return ret;
 +  }
  
+   pre_compositor_.reset(new GLWorkerCompositor());
+   ret = pre_compositor_->Init();
+   if (ret) {
+     ALOGE("Failed to initialize OpenGL compositor %d", ret);
+     pre_compositor_.reset();
+   }
+ 
    initialized_ = true;
    return 0;
  }

diff --cc drmdisplaycompositor.h
index 9487cac,ed6c5f9..91753a2
--- 1/drmdisplaycompositor.h
--- 2/drmdisplaycompositor.h
+++ b/drmdisplaycompositor.h
@@@ -102,29 -98,10 +102,32 @@@ class DrmDisplayCompositor 
      return &squash_state_;
    }
  
+   bool uses_GL() {
+     return !!pre_compositor_;
+   }
   private:
 +  struct FrameState {
 +    std::unique_ptr<DrmDisplayComposition> composition;
 +    int status = 0;
 +  };
 +
 +  class FrameWorker : public Worker {
 +   public:
 +    FrameWorker(DrmDisplayCompositor *compositor);
 +    ~FrameWorker() override;
 +
 +    int Init();
 +    void QueueFrame(std::unique_ptr<DrmDisplayComposition> composition,
 +                    int status);
 +
 +   protected:
 +    void Routine() override;
 +
 +   private:
 +    DrmDisplayCompositor *compositor_;
 +    std::queue<FrameState> frame_queue_;
 +  };
 +
    struct ModeState {
      bool needs_modeset = false;
      DrmMode mode;

diff --cc drmeventlistener.cpp
index 29130d5,9cdff81..1526d0f
--- 1/drmeventlistener.cpp
--- 2/drmeventlistener.cpp
+++ b/drmeventlistener.cpp
@@@ -23,9 -23,11 +23,9 @@@
  #include <linux/netlink.h>
  #include <sys/socket.h>
  
- #include <cutils/log.h>
+ #include <log/log.h>
 -#include <hardware/hardware.h>
 -#include <hardware/hwcomposer.h>
  #include <xf86drm.h>
 +#include <assert.h>
  
  namespace android {
  

diff --cc drmhwctwo.cpp
Simple merge

diff --cc drmresources.cpp
Simple merge

diff --cc hwcomposer.cpp
Simple merge