From 2e70a86900962b1f5f6ad79ca3245bc99873d889 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Tue, 4 Oct 2016 11:29:26 +0200
Subject: 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>
---
 .../eglfs_kms_support/qeglfskmsdevice.h            | 60 +++-------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

(limited to 'src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h')

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h
index 3e7ac7e3f0..1bbea250bb 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h
@@ -1,6 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
@@ -42,64 +41,21 @@
 #ifndef QEGLFSKMSDEVICE_H
 #define QEGLFSKMSDEVICE_H
 
-#include "qeglfskmsintegration.h"
-#include "qeglfskmsscreen.h"
-
-#include <xf86drm.h>
-#include <xf86drmMode.h>
+#include "private/qeglfsglobal_p.h"
+#include <QtKmsSupport/private/qkmsdevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_EGLFS_EXPORT QEglFSKmsDevice
+class Q_EGLFS_EXPORT QEglFSKmsDevice : public QKmsDevice
 {
 public:
-    struct VirtualDesktopInfo {
-        VirtualDesktopInfo() : virtualIndex(0) { }
-        int virtualIndex;
-        QPoint virtualPos;
-    };
-
-    QEglFSKmsDevice(QEglFSKmsIntegration *integration, const QString &path);
-    virtual ~QEglFSKmsDevice();
-
-    virtual bool open() = 0;
-    virtual void close() = 0;
-
-    virtual void createScreens();
-
-    virtual EGLNativeDisplayType nativeDisplay() const = 0;
-    int fd() const;
-    QString devicePath() const;
-
-protected:
-    virtual QEglFSKmsScreen *createScreen(QEglFSKmsIntegration *integration,
-                                          QEglFSKmsDevice *device,
-                                          QEglFSKmsOutput output);
-    void setFd(int fd);
-
-    QEglFSKmsIntegration *m_integration;
-    QString m_path;
-    int m_dri_fd;
-
-    quint32 m_crtc_allocator;
-    quint32 m_connector_allocator;
-
-    int crtcForConnector(drmModeResPtr resources, drmModeConnectorPtr connector);
-    QEglFSKmsScreen *createScreenForConnector(drmModeResPtr resources,
-                                              drmModeConnectorPtr connector,
-                                              VirtualDesktopInfo *vinfo);
-    drmModePropertyPtr connectorProperty(drmModeConnectorPtr connector, const QByteArray &name);
-
-    static void pageFlipHandler(int fd,
-                                unsigned int sequence,
-                                unsigned int tv_sec,
-                                unsigned int tv_usec,
-                                void *user_data);
+    QEglFSKmsDevice(QKmsScreenConfig *screenConfig, const QString &path);
 
-private:
-    Q_DISABLE_COPY(QEglFSKmsDevice)
+    void registerScreen(QPlatformScreen *screen,
+                        const QPoint &virtualPos,
+                        const QList<QPlatformScreen *> &virtualSiblings) override;
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QEGLFSKMSDEVICE_H
-- 
cgit v1.2.3