Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensource

Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp
index 81ce7e1d71..749750042c 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp
@@ -58,7 +58,12 @@ bool QEglFSKmsEglDevice::open()
 {
     Q_ASSERT(fd() == -1);
 
-    int fd = drmOpen(devicePath().toLocal8Bit().constData(), nullptr);
+    int fd = -1;
+
+    if (devicePath().compare("drm-nvdc") == 0)
+        fd = drmOpen(devicePath().toLocal8Bit().constData(), nullptr);
+    else
+        fd = qt_safe_open(devicePath().toLocal8Bit().constData(), O_RDWR);
     if (Q_UNLIKELY(fd < 0))
         qFatal("Could not open DRM (NV) device");