Move DRM/KMS code from eglfs into kmsconvenience

The generic DRM code, not involving any GBM or EGLDevice stuff, can
now be reused in components outside eglfs, for example linuxfb in
order to get support for DRM dumb buffers.

Task-number: QTBUG-56306
Change-Id: If7dffdb2415489dbc6470782fa76efcaeccf01c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

7 files changed, 51 insertions, 43 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
index 255db824b7..e522c0ee1b 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
@@ -4,7 +4,7 @@ PLUGIN_TYPE = egldeviceintegrations
 PLUGIN_CLASS_NAME = QEglFSKmsGbmIntegrationPlugin
 load(qt_plugin)
 
-QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private
+QT += core-private gui-private eglfsdeviceintegration-private eglfs_kms_support-private kms_support-private
 
 INCLUDEPATH += $$PWD/../../api $$PWD/../eglfs_kms_support
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
index 3a220ec942..2040d6bc0e 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.cpp
@@ -46,7 +46,6 @@
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/private/qcore_unix_p.h>
-#include <QtGui/private/qguiapplication_p.h>
 
 #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
 
@@ -65,8 +64,8 @@ void QEglFSKmsGbmDevice::pageFlipHandler(int fd, unsigned int sequence, unsigned
     screen->flipFinished();
 }
 
-QEglFSKmsGbmDevice::QEglFSKmsGbmDevice(QEglFSKmsIntegration *integration, const QString &path)
-    : QEglFSKmsDevice(integration, path)
+QEglFSKmsGbmDevice::QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path)
+    : QEglFSKmsDevice(screenConfig, path)
     , m_gbm_device(Q_NULLPTR)
     , m_globalCursor(Q_NULLPTR)
 {
@@ -77,7 +76,6 @@ bool QEglFSKmsGbmDevice::open()
     Q_ASSERT(fd() == -1);
     Q_ASSERT(m_gbm_device == Q_NULLPTR);
 
-    qCDebug(qLcEglfsKmsDebug) << "Opening device" << devicePath();
     int fd = qt_safe_open(devicePath().toLocal8Bit().constData(), O_RDWR | O_CLOEXEC);
     if (fd == -1) {
         qErrnoWarning("Could not open DRM device %s", qPrintable(devicePath()));
@@ -101,6 +99,8 @@ bool QEglFSKmsGbmDevice::open()
 
 void QEglFSKmsGbmDevice::close()
 {
+    // Note: screens are gone at this stage.
+
     if (m_gbm_device) {
         gbm_device_destroy(m_gbm_device);
         m_gbm_device = Q_NULLPTR;
@@ -110,15 +110,11 @@ void QEglFSKmsGbmDevice::close()
         qt_safe_close(fd());
         setFd(-1);
     }
-
-    if (m_globalCursor)
-        m_globalCursor->deleteLater();
-    m_globalCursor = Q_NULLPTR;
 }
 
-EGLNativeDisplayType QEglFSKmsGbmDevice::nativeDisplay() const
+void *QEglFSKmsGbmDevice::nativeDisplay() const
 {
-    return reinterpret_cast<EGLNativeDisplayType>(m_gbm_device);
+    return m_gbm_device;
 }
 
 gbm_device * QEglFSKmsGbmDevice::gbmDevice() const
@@ -131,6 +127,17 @@ QPlatformCursor *QEglFSKmsGbmDevice::globalCursor() const
     return m_globalCursor;
 }
 
+// Cannot do this from close(), it may be too late.
+// Call this from the last screen dtor instead.
+void QEglFSKmsGbmDevice::destroyGlobalCursor()
+{
+    if (m_globalCursor) {
+        qCDebug(qLcEglfsKmsDebug, "Destroying global GBM mouse cursor");
+        delete m_globalCursor;
+        m_globalCursor = Q_NULLPTR;
+    }
+}
+
 void QEglFSKmsGbmDevice::handleDrmEvent()
 {
     drmEventContext drmEvent = {
@@ -142,14 +149,13 @@ void QEglFSKmsGbmDevice::handleDrmEvent()
     drmHandleEvent(fd(), &drmEvent);
 }
 
-QEglFSKmsScreen *QEglFSKmsGbmDevice::createScreen(QEglFSKmsIntegration *integration, QEglFSKmsDevice *device, QEglFSKmsOutput output)
+QPlatformScreen *QEglFSKmsGbmDevice::createScreen(const QKmsOutput &output)
 {
-    static bool firstScreen = true;
-    QEglFSKmsGbmScreen *screen = new QEglFSKmsGbmScreen(integration, device, output);
+    QEglFSKmsGbmScreen *screen = new QEglFSKmsGbmScreen(this, output);
 
-    if (firstScreen && integration->hwCursor()) {
+    if (!m_globalCursor && screenConfig()->hwCursor()) {
+        qCDebug(qLcEglfsKmsDebug, "Creating new global GBM mouse cursor");
         m_globalCursor = new QEglFSKmsGbmCursor(screen);
-        firstScreen = false;
     }
 
     return screen;
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
index 7c0af84422..25284c6468 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h
@@ -43,7 +43,7 @@
 #define QEGLFSKMSGBMDEVICE_H
 
 #include "qeglfskmsgbmcursor.h"
-#include "qeglfskmsdevice.h"
+#include <qeglfskmsdevice.h>
 
 #include <gbm.h>
 
@@ -54,21 +54,20 @@ class QEglFSKmsScreen;
 class QEglFSKmsGbmDevice: public QEglFSKmsDevice
 {
 public:
-    QEglFSKmsGbmDevice(QEglFSKmsIntegration *integration, const QString &path);
+    QEglFSKmsGbmDevice(QKmsScreenConfig *screenConfig, const QString &path);
 
     bool open() Q_DECL_OVERRIDE;
     void close() Q_DECL_OVERRIDE;
 
-    EGLNativeDisplayType nativeDisplay() const Q_DECL_OVERRIDE;
+    void *nativeDisplay() const Q_DECL_OVERRIDE;
     gbm_device *gbmDevice() const;
 
     QPlatformCursor *globalCursor() const;
+    void destroyGlobalCursor();
 
     void handleDrmEvent();
 
-    virtual QEglFSKmsScreen *createScreen(QEglFSKmsIntegration *integration,
-                                          QEglFSKmsDevice *device,
-                                          QEglFSKmsOutput output) Q_DECL_OVERRIDE;
+    QPlatformScreen *createScreen(const QKmsOutput &output) Q_DECL_OVERRIDE;
 
 private:
     Q_DISABLE_COPY(QEglFSKmsGbmDevice)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
index 38419a55c8..16767114ab 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
@@ -63,8 +63,9 @@ QT_BEGIN_NAMESPACE
 QMutex QEglFSKmsGbmScreen::m_waitForFlipMutex;
 
 QEglFSKmsGbmIntegration::QEglFSKmsGbmIntegration()
-    : QEglFSKmsIntegration()
-{}
+{
+    qCDebug(qLcEglfsKmsDebug, "New DRM/KMS via GBM integration created");
+}
 
 EGLNativeWindowType QEglFSKmsGbmIntegration::createNativeWindow(QPlatformWindow *platformWindow,
                                                      const QSize &size,
@@ -104,10 +105,12 @@ void QEglFSKmsGbmIntegration::destroyNativeWindow(EGLNativeWindowType window)
 
 QPlatformCursor *QEglFSKmsGbmIntegration::createCursor(QPlatformScreen *screen) const
 {
-    if (hwCursor())
-        return Q_NULLPTR;
-    else
+    if (screenConfig()->hwCursor()) {
+        return nullptr;
+    } else {
+        qCDebug(qLcEglfsKmsDebug, "Using plain OpenGL mouse cursor");
         return new QEglFSCursor(screen);
+    }
 }
 
 void QEglFSKmsGbmIntegration::presentBuffer(QPlatformSurface *surface)
@@ -118,13 +121,12 @@ void QEglFSKmsGbmIntegration::presentBuffer(QPlatformSurface *surface)
     screen->flip();
 }
 
-QEglFSKmsDevice *QEglFSKmsGbmIntegration::createDevice(const QString &devicePath)
+QKmsDevice *QEglFSKmsGbmIntegration::createDevice()
 {
-    QString path = devicePath;
-    if (!devicePath.isEmpty()) {
-        qCDebug(qLcEglfsKmsDebug) << "Using DRM device" << path << "specified in config file";
+    QString path = screenConfig()->devicePath();
+    if (!path.isEmpty()) {
+        qCDebug(qLcEglfsKmsDebug) << "GBM: Using DRM device" << path << "specified in config file";
     } else {
-
         QDeviceDiscovery *d = QDeviceDiscovery::create(QDeviceDiscovery::Device_VideoMask);
         const QStringList devices = d->scanConnectedDevices();
         qCDebug(qLcEglfsKmsDebug) << "Found the following video devices:" << devices;
@@ -137,7 +139,7 @@ QEglFSKmsDevice *QEglFSKmsGbmIntegration::createDevice(const QString &devicePath
         qCDebug(qLcEglfsKmsDebug) << "Using" << path;
     }
 
-    return new QEglFSKmsGbmDevice(this, path);
+    return new QEglFSKmsGbmDevice(screenConfig(), path);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
index 727571d3e3..fa2e494a89 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
@@ -65,7 +65,7 @@ public:
     void presentBuffer(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
 protected:
-    QEglFSKmsDevice *createDevice(const QString &devicePath) Q_DECL_OVERRIDE;
+    QKmsDevice *createDevice() Q_DECL_OVERRIDE;
 
 private:
 };
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
index bed775ff81..ebce0a4776 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
@@ -92,10 +92,8 @@ QEglFSKmsGbmScreen::FrameBuffer *QEglFSKmsGbmScreen::framebufferForBufferObject(
     return fb.take();
 }
 
-QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QEglFSKmsIntegration *integration,
-                                       QEglFSKmsDevice *device,
-                                       QEglFSKmsOutput output)
-    : QEglFSKmsScreen(integration, device, output)
+QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output)
+    : QEglFSKmsScreen(device, output)
     , m_gbm_surface(Q_NULLPTR)
     , m_gbm_bo_current(Q_NULLPTR)
     , m_gbm_bo_next(Q_NULLPTR)
@@ -105,12 +103,17 @@ QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QEglFSKmsIntegration *integration,
 
 QEglFSKmsGbmScreen::~QEglFSKmsGbmScreen()
 {
+    const int remainingScreenCount = qGuiApp->screens().count();
+    qCDebug(qLcEglfsKmsDebug, "Screen dtor. Remaining screens: %d", remainingScreenCount);
+    if (!remainingScreenCount && !device()->screenConfig()->separateScreens())
+        static_cast<QEglFSKmsGbmDevice *>(device())->destroyGlobalCursor();
 }
 
 QPlatformCursor *QEglFSKmsGbmScreen::cursor() const
 {
-    if (integration()->hwCursor()) {
-        if (!integration()->separateScreens())
+    QKmsScreenConfig *config = device()->screenConfig();
+    if (config->hwCursor()) {
+        if (!config->separateScreens())
             return static_cast<QEglFSKmsGbmDevice *>(device())->globalCursor();
 
         if (m_cursor.isNull()) {
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
index d7ad348291..ffc96955d4 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h
@@ -54,9 +54,7 @@ class QEglFSKmsGbmCursor;
 class QEglFSKmsGbmScreen : public QEglFSKmsScreen
 {
 public:
-    QEglFSKmsGbmScreen(QEglFSKmsIntegration *integration,
-                       QEglFSKmsDevice *device,
-                       QEglFSKmsOutput output);
+    QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output);
     ~QEglFSKmsGbmScreen();
 
     QPlatformCursor *cursor() const Q_DECL_OVERRIDE;