From acf38d364b8fa9db80b10f68da7be7295a40c879 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Thu, 16 Mar 2023 20:43:35 +0100
Subject: [PATCH] backends/drm: add linear dmabuf multi gpu fallback

---
 src/backends/drm/drm_egl_layer_surface.cpp | 48 +++++++++++-----------
 src/backends/drm/drm_egl_layer_surface.h   |  1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/backends/drm/drm_egl_layer_surface.cpp b/src/backends/drm/drm_egl_layer_surface.cpp
index 307dd5fe8b..5c1f8cceee 100644
--- a/src/backends/drm/drm_egl_layer_surface.cpp
+++ b/src/backends/drm/drm_egl_layer_surface.cpp
@@ -191,7 +191,7 @@ std::optional<EglGbmLayerSurface::Surface> EglGbmLayerSurface::createSurface(con
             return lhs.bpp < rhs.bpp;
         }
     };
-    const auto testFormats = [this, &size, &formats](const QVector<GbmFormat> &gbmFormats, MultiGpuImportMode importMode) -> std::optional<Surface> {
+    const auto doTestFormats = [this, &size, &formats](const QVector<GbmFormat> &gbmFormats, MultiGpuImportMode importMode) -> std::optional<Surface> {
         for (const auto &format : gbmFormats) {
             if (m_formatOption == FormatOption::RequireAlpha && format.alphaSize == 0) {
                 continue;
@@ -203,40 +203,40 @@ std::optional<EglGbmLayerSurface::Surface> EglGbmLayerSurface::createSurface(con
         }
         return std::nullopt;
     };
-    std::sort(preferredFormats.begin(), preferredFormats.end(), sort);
-    if (const auto surface = testFormats(preferredFormats, MultiGpuImportMode::Dmabuf)) {
-        if (m_gpu != m_eglBackend->gpu()) {
-            qCDebug(KWIN_DRM) << "chose dmabuf import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
-        }
-        return surface;
-    }
-    if (m_gpu != m_eglBackend->gpu()) {
-        if (const auto surface = testFormats(preferredFormats, MultiGpuImportMode::DumbBuffer)) {
-            qCDebug(KWIN_DRM) << "chose cpu import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
+    const auto testFormats = [this, &sort, &doTestFormats](QVector<GbmFormat> &formats) -> std::optional<Surface> {
+        std::sort(formats.begin(), formats.end(), sort);
+        if (const auto surface = doTestFormats(formats, MultiGpuImportMode::Dmabuf)) {
+            if (m_gpu != m_eglBackend->gpu()) {
+                qCDebug(KWIN_DRM) << "chose dmabuf import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
+            }
             return surface;
         }
-    }
-    std::sort(fallbackFormats.begin(), fallbackFormats.end(), sort);
-    if (const auto surface = testFormats(fallbackFormats, MultiGpuImportMode::Dmabuf)) {
         if (m_gpu != m_eglBackend->gpu()) {
-            qCDebug(KWIN_DRM) << "chose dmabuf import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
+            if (const auto surface = doTestFormats(formats, MultiGpuImportMode::LinearDmabuf)) {
+                qCDebug(KWIN_DRM) << "chose linear dmabuf import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
+                return surface;
+            }
+            if (const auto surface = doTestFormats(formats, MultiGpuImportMode::DumbBuffer)) {
+                qCDebug(KWIN_DRM) << "chose cpu import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
+                return surface;
+            }
         }
-        return surface;
+        return std::nullopt;
+    };
+    if (const auto ret = testFormats(preferredFormats)) {
+        return ret;
+    } else if (const auto ret = testFormats(fallbackFormats)) {
+        return ret;
+    } else {
+        return std::nullopt;
     }
-    if (m_gpu != m_eglBackend->gpu()) {
-        if (const auto surface = testFormats(fallbackFormats, MultiGpuImportMode::DumbBuffer)) {
-            qCDebug(KWIN_DRM) << "chose cpu import with format" << formatName(surface->gbmSwapchain->format()).name << "and modifier" << surface->gbmSwapchain->modifier();
-            return surface;
-        }
-    }
-    return std::nullopt;
 }
 
 std::optional<EglGbmLayerSurface::Surface> EglGbmLayerSurface::createSurface(const QSize &size, uint32_t format, const QVector<uint64_t> &modifiers, MultiGpuImportMode importMode) const
 {
     Surface ret;
     ret.importMode = importMode;
-    ret.forceLinear = importMode == MultiGpuImportMode::DumbBuffer || m_bufferTarget != BufferTarget::Normal;
+    ret.forceLinear = importMode == MultiGpuImportMode::DumbBuffer || importMode == MultiGpuImportMode::LinearDmabuf || m_bufferTarget != BufferTarget::Normal;
     ret.gbmSwapchain = createGbmSwapchain(size, format, modifiers, ret.forceLinear);
     if (!ret.gbmSwapchain) {
         return std::nullopt;
diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h
index 80747b5b9e..ce01fa19cb 100644
--- a/src/backends/drm/drm_egl_layer_surface.h
+++ b/src/backends/drm/drm_egl_layer_surface.h
@@ -68,6 +68,7 @@ public:
 private:
     enum class MultiGpuImportMode {
         Dmabuf,
+        LinearDmabuf,
         DumbBuffer
     };
     struct Surface