From 3d556bba83d05ca3cb2aba746f61139a06d5e0c7 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Wed, 13 Apr 2022 22:46:45 +0200
Subject: [PATCH] backends/drm: drop DrmGpu test mode

It's unused
---
 src/backends/drm/drm_gpu.cpp    | 13 +++----------
 src/backends/drm/drm_gpu.h      |  6 +-----
 src/backends/drm/drm_output.cpp |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp
index d3a54a2408..e4ad43d732 100644
--- a/src/backends/drm/drm_gpu.cpp
+++ b/src/backends/drm/drm_gpu.cpp
@@ -395,7 +395,7 @@ bool DrmGpu::checkCrtcAssignment(QVector<DrmConnector *> connectors, const QVect
     return false;
 }
 
-bool DrmGpu::testPendingConfiguration(TestMode mode)
+bool DrmGpu::testPendingConfiguration()
 {
     QVector<DrmConnector *> connectors;
     for (const auto &conn : qAsConst(m_connectors)) {
@@ -417,14 +417,7 @@ bool DrmGpu::testPendingConfiguration(TestMode mode)
             return c1->getProp(DrmConnector::PropertyIndex::CrtcId)->current() > c2->getProp(DrmConnector::PropertyIndex::CrtcId)->current();
         });
     }
-    const auto &test = [&connectors, &crtcs, this, mode]() {
-        if (mode == TestMode::TestWithCrtcReallocation) {
-            return checkCrtcAssignment(connectors, crtcs);
-        } else {
-            return testPipelines();
-        }
-    };
-    if (test()) {
+    if (checkCrtcAssignment(connectors, crtcs)) {
         return true;
     } else {
         // try again without hw rotation
@@ -433,7 +426,7 @@ bool DrmGpu::testPendingConfiguration(TestMode mode)
             hwRotationUsed |= (pipeline->pending.bufferTransformation != DrmPlane::Transformations(DrmPlane::Transformation::Rotate0));
             pipeline->pending.bufferTransformation = DrmPlane::Transformation::Rotate0;
         }
-        return hwRotationUsed ? test() : false;
+        return hwRotationUsed ? checkCrtcAssignment(connectors, crtcs) : false;
     }
 }
 
diff --git a/src/backends/drm/drm_gpu.h b/src/backends/drm/drm_gpu.h
index a5e6aabbdc..99bd556c31 100644
--- a/src/backends/drm/drm_gpu.h
+++ b/src/backends/drm/drm_gpu.h
@@ -81,11 +81,7 @@ public:
     DrmVirtualOutput *createVirtualOutput(const QString &name, const QSize &size, double scale, VirtualOutputMode mode);
     void removeVirtualOutput(DrmVirtualOutput *output);
 
-    enum class TestMode {
-        TestOnly,
-        TestWithCrtcReallocation
-    };
-    bool testPendingConfiguration(TestMode mode = TestMode::TestWithCrtcReallocation);
+    bool testPendingConfiguration();
     bool needsModeset() const;
     bool maybeModeset();
 
diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
index 8bf1fca828..653ffb326c 100644
--- a/src/backends/drm/drm_output.cpp
+++ b/src/backends/drm/drm_output.cpp
@@ -296,7 +296,7 @@ void DrmOutput::updateModes()
         if (currentMode != m_pipeline->pending.mode) {
             // DrmConnector::findCurrentMode might fail
             m_pipeline->pending.mode = currentMode ? currentMode : m_pipeline->connector()->modes().constFirst();
-            if (m_gpu->testPendingConfiguration(DrmGpu::TestMode::TestWithCrtcReallocation)) {
+            if (m_gpu->testPendingConfiguration()) {
                 m_pipeline->applyPendingChanges();
                 setCurrentModeInternal(m_pipeline->pending.mode->size(), m_pipeline->pending.mode->refreshRate());
                 m_renderLoop->setRefreshRate(m_pipeline->pending.mode->refreshRate());