commit 64c03fe39a1d0c8bf74129cce02cbda2af70d485
author Patrick Tjin <pattjin@google.com> Mon Sep 16 21:42:20 2013 -0700
committer The Android Automerger <android-build@android.com> Tue Sep 17 15:33:50 2013 -0700
tree 48ea6f10bc556dbf399bc43c0aa25e68f812e573
parent 04dd30c0e9b2f68141a0b43160c7dcec3946dbee

Revert "hwc: Get the retire fence from the MDP driver"

This reverts commit 63d668829904b49e30e2e3e53defbfda70ab23b7.

msm8974/libhwcomposer/hwc_utils.cpp

diff --git a/msm8974/libhwcomposer/hwc_utils.cpp b/msm8974/libhwcomposer/hwc_utils.cpp
index 0c59b88..d52e0b5 100644
--- a/msm8974/libhwcomposer/hwc_utils.cpp
+++ b/msm8974/libhwcomposer/hwc_utils.cpp
@@ -602,7 +602,6 @@
     int acquireFd[MAX_NUM_APP_LAYERS];
     int count = 0;
     int releaseFd = -1;
-    int retireFd = -1;
     int fbFd = -1;
     bool swapzero = false;
     int mdpVersion = qdutils::MDPVersion::getInstance().getMDPVersion();
@@ -611,7 +610,6 @@
     memset(&data, 0, sizeof(data));
     data.acq_fen_fd = acquireFd;
     data.rel_fen_fd = &releaseFd;
-    data.retire_fen_fd = &retireFd;
 
     char property[PROPERTY_VALUE_MAX];
     if(property_get("debug.egl.swapinterval", property, "1") > 0) {
@@ -622,13 +620,11 @@
     for(uint32_t i = 0; i < ctx->mLayerRotMap[dpy]->getCount(); i++) {
         int rotFd = ctx->mRotMgr->getRotDevFd();
         int rotReleaseFd = -1;
-        int rotRetireFd = -1;
         struct mdp_buf_sync rotData;
         memset(&rotData, 0, sizeof(rotData));
         rotData.acq_fen_fd =
                 &ctx->mLayerRotMap[dpy]->getLayer(i)->acquireFenceFd;
         rotData.rel_fen_fd = &rotReleaseFd; //driver to populate this
-        rotData.retire_fen_fd = &rotRetireFd;
         rotData.session_id = ctx->mLayerRotMap[dpy]->getRot(i)->getSessId();
         int ret = 0;
         ret = ioctl(rotFd, MSMFB_BUFFER_SYNC, &rotData);
@@ -644,8 +640,6 @@
             //rotator
             ctx->mLayerRotMap[dpy]->getLayer(i)->releaseFenceFd =
                     rotReleaseFd;
-            //Not used for rotator
-            close(rotRetireFd);
         }
     }
 
@@ -714,12 +708,14 @@
 
     //Signals when MDP finishes reading rotator buffers.
     ctx->mLayerRotMap[dpy]->setReleaseFd(releaseFd);
-    close(releaseFd);
 
-    if(UNLIKELY(swapzero))
+    if(UNLIKELY(swapzero)){
         list->retireFenceFd = -1;
-    else
-        list->retireFenceFd = retireFd;
+        close(releaseFd);
+    } else {
+        list->retireFenceFd = releaseFd;
+    }
+
     return ret;
 }