Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	configure
	qmake/Makefile.unix.macos
	qmake/Makefile.unix.win32
	qmake/generators/win32/msvc_vcproj.cpp
	src/3rdparty/pcre/qt_attribution.json
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qdeadlinetimer.cpp
	src/platformsupport/kmsconvenience/qkmsdevice.cpp
	src/platformsupport/kmsconvenience/qkmsdevice_p.h
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
	tests/manual/qstorageinfo/printvolumes.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e

2 files changed, 40 insertions, 1 deletions

diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index 541fcd155d..319c7f3d9b 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -332,9 +332,32 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
         drmModeGetCrtc(m_dri_fd, crtc_id),
         modes,
         connector->subpixel,
-        connectorProperty(connector, QByteArrayLiteral("DPMS"))
+        connectorProperty(connector, QByteArrayLiteral("DPMS")),
+        false,
+        0,
+        false
     };
 
+    bool ok;
+    int idx = qEnvironmentVariableIntValue("QT_QPA_EGLFS_KMS_PLANE_INDEX", &ok);
+    if (ok) {
+        drmModePlaneRes *planeResources = drmModeGetPlaneResources(m_dri_fd);
+        if (planeResources) {
+            if (idx >= 0 && idx < int(planeResources->count_planes)) {
+                drmModePlane *plane = drmModeGetPlane(m_dri_fd, planeResources->planes[idx]);
+                if (plane) {
+                    output.wants_plane = true;
+                    output.plane_id = plane->plane_id;
+                    qCDebug(qLcKmsDebug, "Forcing plane index %d, plane id %u (belongs to crtc id %u)",
+                            idx, plane->plane_id, plane->crtc_id);
+                    drmModeFreePlane(plane);
+                }
+            } else {
+                qWarning("Invalid plane index %d, must be between 0 and %u", idx, planeResources->count_planes - 1);
+            }
+        }
+    }
+
     m_crtc_allocator |= (1 << output.crtc_id);
     m_connector_allocator |= (1 << output.connector_id);
 
@@ -410,7 +433,20 @@ void QKmsDevice::createScreens()
 
     QVector<OrderedScreen> screens;
 
+    int wantedConnectorIndex = -1;
+    bool ok;
+    int idx = qEnvironmentVariableIntValue("QT_QPA_EGLFS_KMS_CONNECTOR_INDEX", &ok);
+    if (ok) {
+        if (idx >= 0 && idx < resources->count_connectors)
+            wantedConnectorIndex = idx;
+        else
+            qWarning("Invalid connector index %d, must be between 0 and %u", idx, resources->count_connectors - 1);
+    }
+
     for (int i = 0; i < resources->count_connectors; i++) {
+        if (wantedConnectorIndex >= 0 && i != wantedConnectorIndex)
+            continue;
+
         drmModeConnectorPtr connector = drmModeGetConnector(m_dri_fd, resources->connectors[i]);
         if (!connector)
             continue;
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
index 36aba49ff2..c41448bc99 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h
+++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
@@ -106,6 +106,9 @@ struct QKmsOutput
     QList<drmModeModeInfo> modes;
     int subpixel;
     drmModePropertyPtr dpms_prop;
+    bool wants_plane;
+    uint32_t plane_id;
+    bool plane_set;
 
     void restoreMode(QKmsDevice *device);
     void cleanup(QKmsDevice *device);