commit faca20923756bbde0c46550216375ed87b39d5f0
author Sean Paul <seanpaul@chromium.org> Mon Nov 16 13:47:19 2015 -0500
committer Sean Paul <seanpaul@chromium.org> Mon Nov 16 13:47:19 2015 -0500
tree c17a101e67831f4925657fa2623155d6072d2255
parent 8467b129419b0f78974bd478809ad32da4fd09fa

drm_hwcomposer: Increase the virtual display compositor's fence timeout

50ms isn't enough time for some CTS tests (namely testSetLocalFocus). Increase
the timeout to 3 seconds, since we're not too worried about recovery time
from fence timeouts any longer.

Bug: 24362649
Test: Run cts test in a loop, ensuring the virtual compositor doesn't time out:
        run cts --loop  --class android.view.cts.WindowTest --method testSetLocalFocus --disable-reboot --min-loop-time 100 --max-random-loop-time 200

Change-Id: I5552ece3f6fe95d78a4e0770c1e30c96f2e75313
Signed-off-by: Sean Paul <seanpaul@chromium.org>

virtualcompositorworker.cpp

diff --git a/virtualcompositorworker.cpp b/virtualcompositorworker.cpp
index ea46461..92a1634 100644
--- a/virtualcompositorworker.cpp
+++ b/virtualcompositorworker.cpp
@@ -32,7 +32,7 @@
 namespace android {
 
 static const int kMaxQueueDepth = 3;
-static const int kAcquireWaitTimeoutMs = 50;
+static const int kAcquireWaitTimeoutMs = 3000;
 
 VirtualCompositorWorker::VirtualCompositorWorker()
     : Worker("virtual-compositor", HAL_PRIORITY_URGENT_DISPLAY),
@@ -154,7 +154,8 @@
   if (outbuf_acquire_fence >= 0) {
     ret = sync_wait(outbuf_acquire_fence, kAcquireWaitTimeoutMs);
     if (ret) {
-      ALOGE("Failed to wait for acquire %d/%d", outbuf_acquire_fence, ret);
+      ALOGE("Failed to wait for outbuf acquire %d/%d", outbuf_acquire_fence,
+            ret);
       return;
     }
     composition->outbuf_acquire_fence.Close();
@@ -164,7 +165,8 @@
     if (layer_acquire_fence >= 0) {
       ret = sync_wait(layer_acquire_fence, kAcquireWaitTimeoutMs);
       if (ret) {
-        ALOGE("Failed to wait for acquire %d/%d", layer_acquire_fence, ret);
+        ALOGE("Failed to wait for layer acquire %d/%d", layer_acquire_fence,
+              ret);
         return;
       }
       composition->layer_acquire_fences[i].Close();