commit 3934c3916e84e5dde7973c925dbffb9a7a6938da
author Sean Paul <seanpaul@chromium.org> Wed Feb 10 22:35:25 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 10 22:35:25 2016 +0000
tree 0d8b403cfc0c7f227ff5cbbfb3946c6dd2298b94
parent 49d657d512b033addd8926eff7e735d6d36e641b
parent 9b10c5fc9aae12f08362485682e8eb388a56410b

Merge "drm_hwcomposer: Add support for virtual connectors"

drmdisplaycompositor.cpp

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 29ecc75..1012828 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -664,11 +664,14 @@
         DrmHwcLayer &layer = layers[comp_plane.source_layer];
         if (!test_only && layer.acquire_fence.get() >= 0) {
           int acquire_fence = layer.acquire_fence.get();
+          int total_fence_timeout = 0;
           for (int i = 0; i < kAcquireWaitTries; ++i) {
-            ret = sync_wait(acquire_fence, kAcquireWaitTimeoutMs);
+            int fence_timeout = kAcquireWaitTimeoutMs * (1 << i);
+            total_fence_timeout += fence_timeout;
+            ret = sync_wait(acquire_fence, fence_timeout);
             if (ret)
               ALOGW("Acquire fence %d wait %d failed (%d). Total time %d",
-                    acquire_fence, i, ret, (i + 1) * kAcquireWaitTimeoutMs);
+                    acquire_fence, i, ret, total_fence_timeout);
           }
           if (ret) {
             ALOGE("Failed to wait for acquire %d/%d", acquire_fence, ret);