commit 77ede31ecfb15a254d86be76781aa31074ef4ed7
author V S Ganga VaraPrasad (VARA) Adabala <quic_vadabala@quicinc.com> Sat Oct 01 23:29:26 2022 +0530
committer V S Ganga VaraPrasad (VARA) Adabala <quic_vadabala@quicinc.com> Sat Oct 01 23:34:33 2022 +0530
tree ff1bb1af276bbc0bcd75528981a02bc9d5afeaf8
parent 9f749ed9e2dfac5b1c6efb432bf359386029beda

Revert "composer: Return proper status as per CWB release fence existance"

This reverts commit 7ddfce96dd3253e8c395f15c958673265b2651f9.

Change-Id: I5335897e3c7717186414fd653dc522dcb8208858

composer/hwc_display.cpp

diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index 705e2d0..f07a160 100644
--- a/composer/hwc_display.cpp
+++ b/composer/hwc_display.cpp
@@ -3406,14 +3406,7 @@
       // If this function is called after either PostCommitLayerStack or NotifyCwbDone call,
       // then release fence can be successfully retrieved from cwb_capture_status_map_.
       handle_id = cwb_resp.handle_id;
-      if (cwb_resp.status == kCWBReleaseFenceNotChecked) {
-        // if status is updated as kCWBReleaseFenceNotChecked, which means the commit is over
-        // and status got updated in PostCommitLayerStack->HandleFrameOutput. It indicates
-        // that release fence is available.
-        display_intf_->GetOutputBufferAcquireFence(release_fence);
-      } else {
-        *release_fence = cwb_resp.release_fence;
-      }
+      *release_fence = cwb_resp.release_fence;
       status = cwb_resp.status;
     } else if (layer_stack_.output_buffer != nullptr) {
       // If this function is called before both PostCommitLayerStack and NotifyCwbDone call,
@@ -3473,17 +3466,13 @@
 
 HWC2::Error HWCDisplay::GetReadbackBufferFence(shared_ptr<Fence> *release_fence) {
   auto status = HWC2::Error::None;
-  // Get the release fence for kCWBClientComposer only, because this function is designed for
-  // accessing through composer interface, for which, it is following standard prototype and
-  // return type provided by HWC2+ interface. According to HWC2+ interface, only two supported
-  // return types are provided, where one is HWC2::Error::None and another is
-  // HWC2::Error::Unsupported.
   auto error = GetReadbackBufferFenceForClient(kCWBClientComposer, release_fence);
 
-  // if release fence is null pointer, then just return with error.
-  if (release_fence && *release_fence == nullptr) {
+  // if return status is HWC2::Error::None and *release_fence is nullptr, then need to
+  // retry to get release fence, else if *release_fence is not nullptr too, that means release
+  // fence is retrieved successfully, else there is no any valid release fence available.
+  if (error == kCWBReleaseFenceNotAvailable || error == kCWBReleaseFenceUnknownError) {
     status = HWC2::Error::Unsupported;
-    DLOGW("Readback buffer fence is not available! CWBReleaseFenceError: %d", error);
   }
 
   return status;