From d6c828c65a5ff4b768491e9cc0a115c70ec38a44 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 7 Sep 2017 17:22:22 +0200 Subject: kms: Rename the plane index workaround vars appropriately ...and purge support from eglfs_kms. That path never worked, the environment variable was meant for the NVIDIA backend only. Task-number: QTBUG-63058 Change-Id: I8cf47168d5878e18eb22c839d56e2d48cbb4fdad Reviewed-by: Andy Nichols --- src/platformsupport/kmsconvenience/qkmsdevice.cpp | 10 +++++----- src/platformsupport/kmsconvenience/qkmsdevice_p.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp index 753fdb07af..494640b858 100644 --- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp +++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp @@ -376,9 +376,9 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources, output.subpixel = connector->subpixel; output.dpms_prop = connectorProperty(connector, QByteArrayLiteral("DPMS")); output.edid_blob = connectorPropertyBlob(connector, QByteArrayLiteral("EDID")); - output.wants_plane = false; - output.plane_id = 0; - output.plane_set = false; + output.wants_forced_plane = false; + output.forced_plane_id = 0; + output.forced_plane_set = false; output.drm_format = drmFormat; output.clone_source = cloneSource; @@ -390,8 +390,8 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources, 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; + output.wants_forced_plane = true; + output.forced_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); diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h index bbc03b8e2a..b253cced3c 100644 --- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h +++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h @@ -113,9 +113,9 @@ struct QKmsOutput int subpixel = DRM_MODE_SUBPIXEL_UNKNOWN; drmModePropertyPtr dpms_prop = nullptr; drmModePropertyBlobPtr edid_blob = nullptr; - bool wants_plane = false; - uint32_t plane_id = 0; - bool plane_set = false; + bool wants_forced_plane = false; + uint32_t forced_plane_id = 0; + bool forced_plane_set = false; uint32_t drm_format = DRM_FORMAT_XRGB8888; QString clone_source; -- cgit v1.2.3