gistfile1.txt

MerSDK user@Build-Box-III:~/mer/devel/mer-hybris/qt5-qpa-hwcomposer-plugin_old$ git diff                                                     
WARNING: terminal is not fully functional
diff --git a/hwcomposer/hwcomposer.pro b/hwcomposer/hwcomposer.pro
index 4ca6376..a05e0e3 100644
--- a/hwcomposer/hwcomposer.pro
+++ b/hwcomposer/hwcomposer.pro
@@ -31,6 +31,7 @@ HEADERS += hwcomposer_backend_v11.h
 QT += core-private compositor-private gui-private platformsupport-private
 
 DEFINES += QEGL_EXTRA_DEBUG
+DEFINES += QCOM_BSP
 CONFIG += egl qpa/genericunixfontdatabase
 
 CONFIG += link_pkgconfig
diff --git a/hwcomposer/hwcomposer_backend_v11.cpp b/hwcomposer/hwcomposer_backend_v11.cpp
index ee18407..b8cac85 100644
--- a/hwcomposer/hwcomposer_backend_v11.cpp
+++ b/hwcomposer/hwcomposer_backend_v11.cpp
@@ -76,6 +76,12 @@ HWComposer::HWComposer(unsigned int width, unsigned int height, unsigned int for
 
 void HWComposer::present(HWComposerNativeWindowBuffer *buffer)
 {
+    if (getFenceBufferFd(buffer) != -1) {
+        //sync_wait(getFenceBufferFd(buffer), -1);
+        close(getFenceBufferFd(buffer));
+        setFenceBufferFd(buffer, -1);
+    }
+
     int oldretire = mlist[0]->retireFenceFd;
     mlist[0]->retireFenceFd = -1;
     fblayer->handle = buffer->handle;
@@ -92,7 +98,7 @@ void HWComposer::present(HWComposerNativeWindowBuffer *buffer)
 
     if (oldretire != -1)
     {   
-        sync_wait(oldretire, -1);
+        //sync_wait(oldretire, -1);
         close(oldretire);
     }
 }