Merge "drm_hwcomposer: ground work for squashing" into mnc-dr-dev

[android-x86/external-drm_hwcomposer.git] / drmcompositor.cpp

diff --git a/drmcompositor.cpp b/drmcompositor.cpp
index 082e75d..6b3c294 100644 (file)
--- a/drmcompositor.cpp
+++ b/drmcompositor.cpp
@@ -27,7 +27,7 @@
 
 namespace android {
 
-DrmCompositor::DrmCompositor(DrmResources *drm) : drm_(drm) {
+DrmCompositor::DrmCompositor(DrmResources *drm) : drm_(drm), frame_no_(0) {
 }
 
 DrmCompositor::~DrmCompositor() {
@@ -53,7 +53,7 @@ DrmComposition *DrmCompositor::CreateComposition(Importer *importer) {
     ALOGE("Failed to allocate drm composition");
     return NULL;
   }
-  int ret = composition->Init();
+  int ret = composition->Init(++frame_no_);
   if (ret) {
     ALOGE("Failed to initialize drm composition %d", ret);
     delete composition;
@@ -62,12 +62,17 @@ DrmComposition *DrmCompositor::CreateComposition(Importer *importer) {
   return composition;
 }
 
-int DrmCompositor::QueueComposition(DrmComposition *composition) {
-  int ret = composition->DisableUnusedPlanes();
-  if (ret) {
-    ALOGE("Failed to disable unused planes %d", ret);
+int DrmCompositor::QueueComposition(
+    std::unique_ptr<DrmComposition> composition) {
+  int ret;
+
+  ret = composition->Plan(compositor_map_);
+  if (ret)
+    return ret;
+
+  ret = composition->DisableUnusedPlanes();
+  if (ret)
     return ret;
-  }
 
   for (DrmResources::ConnectorIter iter = drm_->begin_connectors();
        iter != drm_->end_connectors(); ++iter) {
@@ -75,8 +80,7 @@ int DrmCompositor::QueueComposition(DrmComposition *composition) {
     int ret = compositor_map_[display].QueueComposition(
         composition->TakeDisplayComposition(display));
     if (ret) {
-      ALOGE("Failed to queue composition for display %d", display);
-      delete composition;
+      ALOGE("Failed to queue composition for display %d (%d)", display, ret);
       return ret;
     }
   }