1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617260319

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-01 09:23:38 +00:00
commit 5bf4133c17
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.cpp
View File

@ -58,7 +58,12 @@ bool QEglFSKmsEglDevice::open()
{ {
Q_ASSERT(fd() == -1); 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)) if (Q_UNLIKELY(fd < 0))
qFatal("Could not open DRM (NV) device"); qFatal("Could not open DRM (NV) device");