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>

1 files changed, 8 insertions, 22 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
index ba49945715..21347d9131 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h
@@ -49,19 +49,16 @@
 
 QT_BEGIN_NAMESPACE
 
-class QEglFSKmsDevice;
+class QKmsDevice;
+class QKmsScreenConfig;
 
 Q_EGLFS_EXPORT Q_DECLARE_LOGGING_CATEGORY(qLcEglfsKmsDebug)
 
 class Q_EGLFS_EXPORT QEglFSKmsIntegration : public QEglFSDeviceIntegration
 {
 public:
-    enum VirtualDesktopLayout {
-        VirtualDesktopLayoutHorizontal,
-        VirtualDesktopLayoutVertical
-    };
-
     QEglFSKmsIntegration();
+    ~QEglFSKmsIntegration();
 
     void platformInit() Q_DECL_OVERRIDE;
     void platformDestroy() Q_DECL_OVERRIDE;
@@ -73,25 +70,14 @@ public:
     void waitForVSync(QPlatformSurface *surface) const Q_DECL_OVERRIDE;
     bool supportsPBuffers() const Q_DECL_OVERRIDE;
 
-    virtual bool hwCursor() const;
-    virtual bool separateScreens() const;
-    virtual VirtualDesktopLayout virtualDesktopLayout() const;
-    QMap<QString, QVariantMap> outputSettings() const;
-
-    QEglFSKmsDevice *device() const;
+    QKmsDevice *device() const;
+    QKmsScreenConfig *screenConfig() const;
 
 protected:
-    virtual QEglFSKmsDevice *createDevice(const QString &devicePath) = 0;
-
-    void loadConfig();
+    virtual QKmsDevice *createDevice() = 0;
 
-    QEglFSKmsDevice *m_device;
-    bool m_hwCursor;
-    bool m_pbuffers;
-    bool m_separateScreens;
-    VirtualDesktopLayout m_virtualDesktopLayout;
-    QString m_devicePath;
-    QMap<QString, QVariantMap> m_outputSettings;
+    QKmsDevice *m_device;
+    QKmsScreenConfig *m_screenConfig;
 };
 
 QT_END_NAMESPACE