From 216d0d6c4562c1677e1c5dca371a1c82eda25eeb Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Tue, 25 Jan 2022 21:19:27 +0100 Subject: [PATCH] backends/drm: only accept xrgb with legacy xrgb is effectively universally supported, other formats may not be. In order to make sure things work everywhere, assume only xrgb is supported. --- src/backends/drm/drm_object_plane.cpp | 3 +-- src/backends/drm/drm_pipeline.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/backends/drm/drm_object_plane.cpp b/src/backends/drm/drm_object_plane.cpp index 8e8318dd26..bedf2eb153 100644 --- a/src/backends/drm/drm_object_plane.cpp +++ b/src/backends/drm/drm_object_plane.cpp @@ -103,9 +103,8 @@ bool DrmPlane::init() } } if (m_supportedFormats.isEmpty()) { - qCWarning(KWIN_DRM) << "Driver doesn't advertise any formats for this plane. Falling back to XRGB8888 and ARGB8888 without modifiers"; + qCWarning(KWIN_DRM) << "Driver doesn't advertise any formats for this plane. Falling back to XRGB8888 without explicit modifiers"; m_supportedFormats.insert(DRM_FORMAT_XRGB8888, {}); - m_supportedFormats.insert(DRM_FORMAT_ARGB8888, {}); } } return success; diff --git a/src/backends/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp index 11d3226c4d..074b0ff172 100644 --- a/src/backends/drm/drm_pipeline.cpp +++ b/src/backends/drm/drm_pipeline.cpp @@ -458,8 +458,7 @@ DrmOutput *DrmPipeline::output() const } static const QMap> legacyFormats = { - {DRM_FORMAT_XRGB8888, {}}, - {DRM_FORMAT_ARGB8888, {}} + {DRM_FORMAT_XRGB8888, {}} }; bool DrmPipeline::isFormatSupported(uint32_t drmFormat) const