commit 40a1cc58d298a8d2e61df8c3be0d85ddf6996d98
author Kinjal Bhavsar <kbhavsar@codeaurora.org> Wed Oct 10 15:52:03 2012 -0700
committer Iliyan Malchev <malchev@google.com> Mon Oct 15 15:25:32 2012 -0700
tree 55185642b3cb828527add05d01fe2460b8c53130
parent 1a8cda0b2cb535656eb18bf5dc07a02fcddec9ab

hwc: Create releaseFd even if no HWC layers

Change-Id: Ic12807d47391d7a48b5db118299aaa3e8b9d8625
Signed-off-by: Iliyan Malchev <malchev@google.com>

libhwcomposer/hwc_utils.cpp

diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index e741eaa..41a9c5a 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -224,31 +224,29 @@
         }
     }
 
-    if (count) {
-        data.acq_fen_fd_cnt = count;
-        fbFd = ctx->dpyAttr[dpy].fd;
+    data.acq_fen_fd_cnt = count;
+    fbFd = ctx->dpyAttr[dpy].fd;
 
-        //Waits for acquire fences, returns a release fence
-        ret = ioctl(fbFd, MSMFB_BUFFER_SYNC, &data);
-        if(ret < 0) {
-            ALOGE("ioctl MSMFB_BUFFER_SYNC failed, err=%s",
-                    strerror(errno));
-        }
-
-        for(uint32_t i = 0; i < list->numHwLayers; i++) {
-            if((list->hwLayers[i].compositionType == HWC_OVERLAY ||
-                list->hwLayers[i].compositionType == HWC_FRAMEBUFFER_TARGET)) {
-                //Close the acquireFenceFds
-                if(list->hwLayers[i].acquireFenceFd > 0) {
-                    close(list->hwLayers[i].acquireFenceFd);
-                    list->hwLayers[i].acquireFenceFd = -1;
-                }
-                //Populate releaseFenceFds.
-                list->hwLayers[i].releaseFenceFd = dup(releaseFd);
-            }
-        }
-        list->retireFenceFd = releaseFd;
+    //Waits for acquire fences, returns a release fence
+    ret = ioctl(fbFd, MSMFB_BUFFER_SYNC, &data);
+    if(ret < 0) {
+        ALOGE("ioctl MSMFB_BUFFER_SYNC failed, err=%s",
+                strerror(errno));
     }
+
+    for(uint32_t i = 0; i < list->numHwLayers; i++) {
+        if((list->hwLayers[i].compositionType == HWC_OVERLAY ||
+            list->hwLayers[i].compositionType == HWC_FRAMEBUFFER_TARGET)) {
+            //Close the acquireFenceFds
+            if(list->hwLayers[i].acquireFenceFd > 0) {
+                close(list->hwLayers[i].acquireFenceFd);
+                list->hwLayers[i].acquireFenceFd = -1;
+            }
+            //Populate releaseFenceFds.
+            list->hwLayers[i].releaseFenceFd = dup(releaseFd);
+        }
+    }
+    list->retireFenceFd = releaseFd;
 #endif
     return ret;
 }