summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/kmsconvenience/qkmsdevice.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-24 09:52:30 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-24 09:52:30 +0200
commitdc373186841802f2dd17fcd243efdeca7d5433e9 (patch)
tree4fff0a3366b63db97ca5a8b04a220bb0b8c56450 /src/platformsupport/kmsconvenience/qkmsdevice.cpp
parent7d646508c8219408f90103ed13613db8d01a4065 (diff)
parentcb10ec56f733c34d23c9e5511b19c1e508d0f13f (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/gui/util/qshaderformat.cpp src/gui/util/qshaderformat_p.h src/widgets/graphicsview/qgraphicsitem_p.h Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca
Diffstat (limited to 'src/platformsupport/kmsconvenience/qkmsdevice.cpp')
-rw-r--r--src/platformsupport/kmsconvenience/qkmsdevice.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index 4b27522976..5838c43eca 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -59,6 +59,7 @@ enum OutputConfiguration {
OutputConfigOff,
OutputConfigPreferred,
OutputConfigCurrent,
+ OutputConfigSkip,
OutputConfigMode,
OutputConfigModeline
};
@@ -191,6 +192,8 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
configuration = OutputConfigPreferred;
} else if (mode == "current") {
configuration = OutputConfigCurrent;
+ } else if (mode == "skip") {
+ configuration = OutputConfigSkip;
} else if (sscanf(mode.constData(), "%dx%d@%d", &configurationSize.rwidth(), &configurationSize.rheight(),
&configurationRefresh) == 3)
{
@@ -229,6 +232,11 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
return nullptr;
}
+ if (configuration == OutputConfigSkip) {
+ qCDebug(qLcKmsDebug) << "Skipping output" << connectorName;
+ return nullptr;
+ }
+
// Get the current mode on the current crtc
drmModeModeInfo crtc_mode;
memset(&crtc_mode, 0, sizeof crtc_mode);