From 7fc131712a68eb584ede11edc7e84451023b25e0 Mon Sep 17 00:00:00 2001
From: Jiyu Yang<Jiyu.Yang@amlogic.com>
Date: Tue, 05  Sep  2017  10:45:27  +0000
Subject: hwc2: rm sync_wait in hwcomposer [1/3]

PD#149525
Change-Id: If45b8af688fc4083a9e161a29018860ca8ed9481
---
diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp
index 1d4f056..fe0616b 100644
--- a/hwc2/common/devices/PhysicalDevice.cpp
+++ b/hwc2/common/devices/PhysicalDevice.cpp
@@ -690,11 +690,6 @@ int32_t PhysicalDevice::postFramebuffer(int32_t* outRetireFence, bool hasVideoOv
         mFbSyncRequest.op |= OSD_BLANK_OP_BIT;
         mFramebufferContext->setStatus(true);
         mPriorFrameRetireFence = hwc_fb_post_with_fence_locked(&fbInfo, &mFbSyncRequest, NULL);
-#if PLATFORM_SDK_VERSION >= 26 //TEMP, will remove later.
-        HwcFenceControl::wait(*outRetireFence, -1);
-        HwcFenceControl::closeFd(*outRetireFence);
-        *outRetireFence = -1;
-#endif
      } else {
         *outRetireFence = HwcFenceControl::dupFence(mPriorFrameRetireFence);
         if (*outRetireFence >= 0) {
@@ -718,12 +713,6 @@ int32_t PhysicalDevice::postFramebuffer(int32_t* outRetireFence, bool hasVideoOv
         // real post framebuffer here.
         DTRACE("render type: %d", mFbSyncRequest.type);
 
-#if PLATFORM_SDK_VERSION >= 26 //TEMP, will remove later.
-        HwcFenceControl::wait(mTargetAcquireFence, -1);
-        HwcFenceControl::closeFd(mTargetAcquireFence);
-        mTargetAcquireFence = -1;
-#endif
-
         if (!bUseHwcPost) {
             setOSD0Blank(needBlankFb0);
             mPriorFrameRetireFence = fb_post_with_fence_locked(&fbInfo, mClientTargetHnd, mTargetAcquireFence);
@@ -759,14 +748,6 @@ int32_t PhysicalDevice::postFramebuffer(int32_t* outRetireFence, bool hasVideoOv
             DTRACE("UPDATE FB1 status to %d", !cursorShow);
             ioctl(cbInfo->fd, FBIOBLANK, !cursorShow);
         }
-
-#if PLATFORM_SDK_VERSION >= 26 //TEMP, will remove later.
-        if (*outRetireFence >= 0) {
-            HwcFenceControl::wait(*outRetireFence, -1);
-            HwcFenceControl::closeFd(*outRetireFence);
-            *outRetireFence = -1;
-        }
-#endif
     }
 
     if (mRenderMode != GE2D_COMPOSE_MODE) {
--
cgit