commit 46b6bce198c81ce9a4e0583e876d080ad48db003
author Jamie Gennis <jgennis@google.com> Fri Dec 07 15:42:15 2012 -0800
committer Jamie Gennis <jgennis@google.com> Fri Dec 07 15:43:02 2012 -0800
tree b7424a2df128fa75fc5d526cfa3985bce3303e96
parent 6eea6fb259a6d0b1c585d3267b8df7ca29a1206d

SurfaceFlinger: work around a driver bug

Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 6bed20a..b6aa005 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -511,6 +511,9 @@
         mFrameTracker.setDesiredPresentTime(desiredPresentTime);
 
         sp<Fence> frameReadyFence = mSurfaceTexture->getCurrentFence();
+        // XXX: Temporarily don't use the fence from the SurfaceTexture to
+        // work around a driver bug.
+        frameReadyFence.clear();
         if (frameReadyFence != NULL) {
             mFrameTracker.setFrameReadyFence(frameReadyFence);
         } else {
@@ -521,6 +524,9 @@
 
         const HWComposer& hwc = mFlinger->getHwComposer();
         sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
+        // XXX: Temporarily don't use the present fence from HWC to work
+        // around a driver bug.
+        presentFence.clear();
         if (presentFence != NULL) {
             mFrameTracker.setActualPresentFence(presentFence);
         } else {