From 0ba5916fe69acf930203afb222650f7f9bcdb4b1 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Tue, 1 Mar 2022 01:10:42 +0100 Subject: [PATCH] backends/drm: remove retry-logic for atomic commits While it can make KWin work even when the driver changes properties behind its back, it can also mask bugs in KWin. --- src/backends/drm/drm_pipeline.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/backends/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp index d40d6556de..2264f5a549 100644 --- a/src/backends/drm/drm_pipeline.cpp +++ b/src/backends/drm/drm_pipeline.cpp @@ -67,23 +67,7 @@ bool DrmPipeline::present() return gpu()->maybeModeset(); } if (gpu()->atomicModeSetting()) { - if (!commitPipelines({this}, CommitMode::Commit)) { - // update properties and try again - m_connector->updateProperties(); - if (pending.crtc) { - pending.crtc->updateProperties(); - if (pending.crtc->primaryPlane()) { - pending.crtc->primaryPlane()->updateProperties(); - } - if (pending.crtc->cursorPlane()) { - pending.crtc->cursorPlane()->updateProperties(); - } - } - if (!commitPipelines({this}, CommitMode::Commit)) { - printDebugInfo(); - return false; - } - } + return commitPipelines({this}, CommitMode::Commit); } else { if (pending.layer->hasDirectScanoutBuffer()) { // already presented