From b5124d9719ff5609832e02cd2b555966a6646b8f Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Thu, 20 Jan 2022 19:29:35 +0200
Subject: Fix run time failure for UI autotests (INTEGRITY)

- Add WFD resources release:
  It provides possibility to re-create native window on run time.
  It allows to run several Qt UI applications (one by one) without device reboot.

- Fix crash that found during window re-creation: ~QOpenGLCompositorBacking() calls
  QOpenGLCompositor::instance(). But compositor is deleted for that moment.

Task-number: QTBUG-99123
Pick-to: 6.2 6.3
Change-Id: I1e6dc9a012a166d1fd6cd1c24f9d2e9a8995fc00
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 .../eglfs_openwfd/qeglfsopenwfdintegration.cpp     | 24 ++++++++++++++--------
 .../eglfs_openwfd/qeglfsopenwfdintegration.h       |  2 ++
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
index b8f04cf978..edea3a3577 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.cpp
@@ -154,23 +154,23 @@ EGLNativeWindowType QEglFSOpenWFDIntegration::createNativeWindow(QPlatformWindow
     if (!ok)
         pipelineId = pipelineIds[0];
 
-    WFDPipeline pipeline = wfdCreatePipeline(mDevice, pipelineId, nullptr);
-    if (WFD_INVALID_HANDLE == pipeline)
+    mPipeline = wfdCreatePipeline(mDevice, pipelineId, nullptr);
+    if (WFD_INVALID_HANDLE == mPipeline)
         qFatal("Failed to create wfd pipeline");
 
-    wfdSetPipelineAttribi(mDevice, pipeline, WFD_PIPELINE_TRANSPARENCY_ENABLE,
+    wfdSetPipelineAttribi(mDevice, mPipeline, WFD_PIPELINE_TRANSPARENCY_ENABLE,
                           (WFD_TRANSPARENCY_SOURCE_ALPHA|WFD_TRANSPARENCY_GLOBAL_ALPHA));
 
     WFDErrorCode eError = wfdGetError(mDevice);
     if (WFD_ERROR_NONE != eError)
         qFatal("Failed to set WFD_PIPELINE_TRANSPARENCY_ENABLE");
 
-    wfdSetPipelineAttribi(mDevice, pipeline, WFD_PIPELINE_GLOBAL_ALPHA, 255);
+    wfdSetPipelineAttribi(mDevice, mPipeline, WFD_PIPELINE_GLOBAL_ALPHA, 255);
     eError = wfdGetError(mDevice);
     if (WFD_ERROR_NONE != eError)
         qFatal("Failed to set WFD_PIPELINE_GLOBAL_ALPHA");
 
-    wfdBindPipelineToPort(mDevice, mPort, pipeline);
+    wfdBindPipelineToPort(mDevice, mPort, mPipeline);
     eError = wfdGetError(mDevice);
     if (WFD_ERROR_NONE != eError)
         qFatal("Failed to bind port to pipeline");
@@ -190,7 +190,7 @@ EGLNativeWindowType QEglFSOpenWFDIntegration::createNativeWindow(QPlatformWindow
         if (WFD_INVALID_HANDLE == wfdEglImages[i])
             qFatal("Failed to create WDFEGLImages");
 
-        source[i] = wfdCreateSourceFromImage(mDevice, pipeline, eglImageHandles[i], nullptr);
+        source[i] = wfdCreateSourceFromImage(mDevice, mPipeline, eglImageHandles[i], nullptr);
         if (WFD_INVALID_HANDLE == source[i])
             qFatal("Failed to create source from EGLImage");
     }
@@ -208,14 +208,13 @@ EGLNativeWindowType QEglFSOpenWFDIntegration::createNativeWindow(QPlatformWindow
 
     nativeWindow->dev = mDevice;
     nativeWindow->port = mPort;
-    nativeWindow->pipeline = pipeline;
+    nativeWindow->pipeline = mPipeline;
     nativeWindow->numBuffers = MAX_NUM_OF_WFD_BUFFERS;
 
     for (int i = 0; i < MAX_NUM_OF_WFD_BUFFERS; i++) {
         nativeWindow->buffers[i].image  = wfdEglImages[i];
         nativeWindow->buffers[i].source = source[i];
     }
-
     return (EGLNativeWindowType)nativeWindow;
 }
 
@@ -231,7 +230,16 @@ QSurfaceFormat QEglFSOpenWFDIntegration::surfaceFormatFor(const QSurfaceFormat &
 
 void QEglFSOpenWFDIntegration::destroyNativeWindow(EGLNativeWindowType window)
 {
+    wfdDestroyPipeline(mDevice, mPipeline);
     free((void*)window);
 }
 
+void QEglFSOpenWFDIntegration::platformDestroy()
+{
+    wfdDestroyPort(mDevice, mPort);
+    WFDErrorCode error = wfdDestroyDevice(mDevice);
+    if (error != WFD_ERROR_NONE)
+        qWarning() << "Failed to release wfd device! Error = " << error;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h
index 189ddd4d7a..ab2105c552 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/qeglfsopenwfdintegration.h
@@ -51,6 +51,7 @@ class QEglFSOpenWFDIntegration : public QEglFSDeviceIntegration
 {
 public:
     void platformInit() override;
+    void platformDestroy() override;
     QSize screenSize() const override;
     EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) override;
     void destroyNativeWindow(EGLNativeWindowType window) override;
@@ -62,6 +63,7 @@ private:
     EGLNativeDisplayType mNativeDisplay;
     WFDDevice mDevice;
     WFDPort mPort;
+    WFDPipeline mPipeline;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3