DO NOT MERGE: drm_hwcomposer: On error, free active composition

am: b4cf01b8ea

Change-Id: I3afa118c0e6d9ffbfc2c5f2e77d09b027882da4d

2 files changed, 24 insertions, 3 deletions

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 0b2506f..279d5a6 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -864,6 +864,23 @@ std::tuple<int, uint32_t> DrmDisplayCompositor::CreateModeBlob(
   return std::make_tuple(ret, id);
 }
 
+void DrmDisplayCompositor::ClearDisplay() {
+  AutoLock lock(&lock_, "compositor");
+  int ret = lock.Lock();
+  if (ret)
+    return;
+
+  if (!active_composition_)
+    return;
+
+  if (DisablePlanes(active_composition_.get()))
+    return;
+
+  active_composition_->SignalCompositionDone();
+
+  active_composition_.reset(NULL);
+}
+
 void DrmDisplayCompositor::ApplyFrame(
     std::unique_ptr<DrmDisplayComposition> composition, int status) {
   int ret = status;
@@ -873,11 +890,10 @@ void DrmDisplayCompositor::ApplyFrame(
 
   if (ret) {
     ALOGE("Composite failed for display %d", display_);
-
     // Disable the hw used by the last active composition. This allows us to
     // signal the release fences from that composition to avoid hanging.
-    if (DisablePlanes(active_composition_.get()))
-      return;
+    ClearDisplay();
+    return;
   }
   ++dump_frames_composited_;
 
@@ -958,6 +974,10 @@ int DrmDisplayCompositor::Composite() {
           composition = std::move(squashed);
         } else {
           ALOGE("Failed to squash frame for display %d", display_);
+          // Disable the hw used by the last active composition. This allows us
+          // to signal the release fences from that composition to avoid
+          // hanging.
+          ClearDisplay();
           return ret;
         }
       }
diff --git a/drmdisplaycompositor.h b/drmdisplaycompositor.h
index e4c3b53..9487cac 100644
--- a/drmdisplaycompositor.h
+++ b/drmdisplaycompositor.h
@@ -149,6 +149,7 @@ class DrmDisplayCompositor {
   int ApplyDpms(DrmDisplayComposition *display_comp);
   int DisablePlanes(DrmDisplayComposition *display_comp);
 
+  void ClearDisplay();
   void ApplyFrame(std::unique_ptr<DrmDisplayComposition> composition,
                   int status);