2 files changed, 27 insertions, 0 deletions
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index a8eefe65ed..a25a1e582f 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -330,11 +330,13 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
         crtc_id,
         physSize,
         selected_mode,
+        selected_mode,
         false,
         drmModeGetCrtc(m_dri_fd, crtc_id),
         modes,
         connector->subpixel,
         connectorProperty(connector, QByteArrayLiteral("DPMS")),
+        connectorPropertyBlob(connector, QByteArrayLiteral("EDID")),
         false,
         0,
         false
@@ -382,6 +384,23 @@ drmModePropertyPtr QKmsDevice::connectorProperty(drmModeConnectorPtr connector,
     return Q_NULLPTR;
 }
 
+drmModePropertyBlobPtr QKmsDevice::connectorPropertyBlob(drmModeConnectorPtr connector, const QByteArray &name)
+{
+    drmModePropertyPtr prop;
+    drmModePropertyBlobPtr blob = nullptr;
+
+    for (int i = 0; i < connector->count_props && !blob; i++) {
+        prop = drmModeGetProperty(m_dri_fd, connector->props[i]);
+        if (!prop)
+            continue;
+        if ((prop->flags & DRM_MODE_PROP_BLOB) && (strcmp(prop->name, name.constData()) == 0))
+            blob = drmModeGetPropertyBlob(m_dri_fd, connector->prop_values[i]);
+        drmModeFreeProperty(prop);
+    }
+
+    return blob;
+}
+
 QKmsDevice::QKmsDevice(QKmsScreenConfig *screenConfig, const QString &path)
     : m_screenConfig(screenConfig)
     , m_path(path)
@@ -626,6 +645,11 @@ void QKmsOutput::cleanup(QKmsDevice *device)
         dpms_prop = nullptr;
     }
 
+    if (edid_blob) {
+        drmModeFreePropertyBlob(edid_blob);
+        edid_blob = nullptr;
+    }
+
     restoreMode(device);
 
     if (saved_crtc) {
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
index 35a51c18b1..964a0b1775 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h
+++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
@@ -100,12 +100,14 @@ struct QKmsOutput
     uint32_t connector_id;
     uint32_t crtc_id;
     QSizeF physical_size;
+    int preferred_mode; // index of preferred mode in list below
     int mode; // index of selected mode in list below
     bool mode_set;
     drmModeCrtcPtr saved_crtc;
     QList<drmModeModeInfo> modes;
     int subpixel;
     drmModePropertyPtr dpms_prop;
+    drmModePropertyBlobPtr edid_blob;
     bool wants_plane;
     uint32_t plane_id;
     bool plane_set;
@@ -153,6 +155,7 @@ protected:
                                               drmModeConnectorPtr connector,
                                               VirtualDesktopInfo *vinfo);
     drmModePropertyPtr connectorProperty(drmModeConnectorPtr connector, const QByteArray &name);
+    drmModePropertyBlobPtr connectorPropertyBlob(drmModeConnectorPtr connector, const QByteArray &name);
 
     QKmsScreenConfig *m_screenConfig;
     QString m_path;