commit 9f749ed9e2dfac5b1c6efb432bf359386029beda
author Jagdish Prajapati <quic_jprajapa@quicinc.com> Thu Sep 01 22:06:30 2022 +0530
committer V S Ganga VaraPrasad (VARA) Adabala <quic_vadabala@quicinc.com> Sat Sep 24 14:21:52 2022 +0530
tree 9ce5d1a6c32122eb97442efb70f285b619d6331c
parent e81e0c1a8f1422ee5a1e2cb4f3fbf3c9b8d65a1e

composer: Avoid deadlock during TUI transition with CWB.

Change-Id: I19ac1d752348d2933e394749ecd763342e1e1ee6

composer/hwc_display.cpp

diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index d4ef924..705e2d0 100644
--- a/composer/hwc_display.cpp
+++ b/composer/hwc_display.cpp
@@ -3169,36 +3169,34 @@
     return kErrorParameters;
   }
 
-  std::unique_lock<std::mutex> lock(cwb_mutex_);
-  if (!cwb_buffer_map_.size() && !display_intf_->HandleCwbTeardown()) {
-    *needs_refresh = false;
-    return kErrorNone;
-  }
+  if (!display_intf_->HandleCwbTeardown()) {
+    bool pending_cwb_request = false;
+    {
+      std::unique_lock<std::mutex> lock(cwb_mutex_);
+      pending_cwb_request = !!cwb_buffer_map_.size();
+    }
 
-  if (!cwb_buffer_map_.size()) {
-    *needs_refresh = false;
-    return kErrorNone;
-  }
-
-  for (auto itr = cwb_buffer_map_.begin(); itr != cwb_buffer_map_.end(); itr++) {
-    if (itr->second == kCWBClientFrameDump) {
+    if (!pending_cwb_request) {
       dump_frame_count_ = 0;
+      dump_frame_index_ = 0;
       dump_output_to_file_ = false;
-      // Unmap and Free buffer
-      if (munmap(output_buffer_base_, output_buffer_info_.alloc_buffer_info.size) != 0) {
-        DLOGW("unmap failed with err %d", errno);
+      if (output_buffer_base_ != nullptr) {
+        if (munmap(output_buffer_base_, output_buffer_info_.alloc_buffer_info.size) != 0) {
+          DLOGW("unmap failed with err %d", errno);
+        }
       }
-      if (buffer_allocator_->FreeBuffer(&output_buffer_info_) != 0) {
+
+      if (buffer_allocator_ && buffer_allocator_->FreeBuffer(&output_buffer_info_) != 0) {
         DLOGW("FreeBuffer failed");
       }
       output_buffer_info_ = {};
       output_buffer_base_ = nullptr;
-    } else if (itr->second == kCWBClientColor) {
       frame_capture_buffer_queued_ = false;
       frame_capture_status_ = 0;
+      *needs_refresh = false;
+      return kErrorNone;
     }
   }
-  cwb_buffer_map_.clear();
 
   *needs_refresh = true;
   return kErrorNone;