commit 9a9d08d8cdd7d3c7ee6cad4e3e3a80572a64090c
author Sean Paul <seanpaul@chromium.org> Wed Apr 12 16:53:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 12 16:53:43 2017 +0000
tree d9e2f9134d45d462f4c2b4f968cd1b92d108dd69
parent 805683297861086955782353927db0f016b4d40f
parent 263a957964dfc75ec2779c8d2b74fa855a60d34c

Merge "drm_hwcomposer: Break out of sync_wait loop on success" am: 669e7766bc am: 050f1d55e8
am: 263a957964

Change-Id: I184cc98822fb2134256e59d992dbc7530d49c00e

drmdisplaycompositor.cpp

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 5da9152..50c1250 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -239,7 +239,6 @@
     ALOGE("Failed to wait for signal, %d", wait_ret);
     return;
   }
-
   compositor_->ApplyFrame(std::move(frame.composition), frame.status);
 }
 
@@ -685,6 +684,8 @@
           if (ret)
             ALOGW("Acquire fence %d wait %d failed (%d). Total time %d",
                   acquire_fence, i, ret, total_fence_timeout);
+          else
+            break;
         }
         if (ret) {
           ALOGE("Failed to wait for acquire %d/%d", acquire_fence, ret);