summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-09-30 20:02:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-01 12:24:59 -0700
commitd30b36d1fd0c7ab80553e784a155266be9703e47 (patch)
tree0e01b7a4d02000bc786ca48433234b6de8de8a54 /services/surfaceflinger
parentec0f5e5f0c433666698fa55c2e38ccdc9cf0df44 (diff)
downloadframeworks_native-d30b36d1fd0c7ab80553e784a155266be9703e47.zip
frameworks_native-d30b36d1fd0c7ab80553e784a155266be9703e47.tar.gz
frameworks_native-d30b36d1fd0c7ab80553e784a155266be9703e47.tar.bz2
SurfaceFlinger: reset the FB_TGT acquire fence
This change makes SurfaceFlinger reset the acquire fence fd to -1 after each call to HWComposer::commit. The HWComposer implementation is resonsible for closing the fd, so SurfaceFlinger should make sure not to pass it to HWC multiple times. Change-Id: I79554d9f6d6ef2b77d632d40251516c1f5b16ddb Bug: 7258954
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/DisplayHardware/HWComposer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 960fb0e..d4adad2 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -613,6 +613,7 @@ int HWComposer::getAndResetReleaseFenceFd(int32_t id) {
const DisplayData& disp(mDisplayData[id]);
if (disp.framebufferTarget) {
fd = disp.framebufferTarget->releaseFenceFd;
+ disp.framebufferTarget->acquireFenceFd = -1;
disp.framebufferTarget->releaseFenceFd = -1;
}
}