commit 0ba9b4623f989ff99de9cfe8230c3e5782c43201
author android-build-team Robot <android-build-team-robot@google.com> Sat Oct 07 08:05:30 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Oct 07 08:05:30 2017 +0000
tree 1fda99711be07a76fe2673d9b14b37c51c810168
parent d99c50afffb5a861f629e52110bfabb08bfa53f0
parent d37101dad9f4b0c28a0f6e83e773a185b39272ce

Snap for 4383207 from d37101dad9f4b0c28a0f6e83e773a185b39272ce to pi-release

Change-Id: I3cbe1fb94778cc030a7ba700954fe8e7ec7c5ec4

drmdisplaycompositor.cpp

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 642a1c7..b3cfb6d 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -986,10 +986,13 @@
       goto move_layers_back;
     }
 
-    if (comp_plane.type() == DrmCompositionPlane::Type::kDisable) {
+    if (comp_plane.plane()->type() == DRM_PLANE_TYPE_PRIMARY)
+      squashed_comp.set_plane(comp_plane.plane());
+    else
       dst->AddPlaneDisable(comp_plane.plane());
+
+    if (comp_plane.type() == DrmCompositionPlane::Type::kDisable)
       continue;
-    }
 
     for (auto i : comp_plane.source_layers()) {
       DrmHwcLayer &layer = src_layers[i];
@@ -1008,11 +1011,12 @@
       squashed_comp.source_layers().push_back(
           squashed_comp.source_layers().size());
     }
+  }
 
-    if (comp_plane.plane()->type() == DRM_PLANE_TYPE_PRIMARY)
-      squashed_comp.set_plane(comp_plane.plane());
-    else
-      dst->AddPlaneDisable(comp_plane.plane());
+  if (squashed_comp.plane() == NULL) {
+    ALOGE("Primary plane not found for squash");
+    ret = -ENOTSUP;
+    goto move_layers_back;
   }
 
   ret = dst->SetLayers(dst_layers.data(), dst_layers.size(), false);