From aef2ce2bdd83f52d4a09023340af6714b8cc43e4 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Mon, 5 Feb 2024 11:55:25 +0100 Subject: [PATCH] Disable DMABuf renderer for NVIDIA proprietary drivers Bug: https://bugs.webkit.org/show_bug.cgi?id=262607 Bug-Debian: https://bugs.debian.org/1039720 Origin: https://github.com/WebKit/WebKit/pull/18614 =================================================================== Gbp-Pq: Name disable-dmabuf-nvidia.patch --- .../gtk/AcceleratedBackingStoreDMABuf.cpp | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp index 64d04332a5..ecf1ac6ca7 100644 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp @@ -38,11 +38,13 @@ #include #include #include +#include #include #include #if USE(GBM) #include +#include #include static constexpr uint64_t s_dmabufInvalidModifier = uint64_t(WebCore::DMABufFormat::Modifier::Invalid); #else @@ -55,6 +57,29 @@ static constexpr uint64_t s_dmabufInvalidModifier = ((1ULL << 56) - 1); namespace WebKit { +static bool isNVIDIA() +{ + const char* forceDMABuf = getenv("WEBKIT_FORCE_DMABUF_RENDERER"); + if (forceDMABuf && strcmp(forceDMABuf, "0")) + return false; + + std::unique_ptr platformDisplay; +#if USE(GBM) + const char* disableGBM = getenv("WEBKIT_DMABUF_RENDERER_DISABLE_GBM"); + if (!disableGBM || !strcmp(disableGBM, "0")) { + if (auto* device = WebCore::PlatformDisplay::sharedDisplay().gbmDevice()) + platformDisplay = WebCore::PlatformDisplayGBM::create(device); + } +#endif + if (!platformDisplay) + platformDisplay = WebCore::PlatformDisplaySurfaceless::create(); + + WebCore::GLContext::ScopedGLContext glContext(WebCore::GLContext::createOffscreen(platformDisplay ? *platformDisplay : WebCore::PlatformDisplay::sharedDisplay())); + if (strstr(reinterpret_cast(glGetString(GL_VENDOR)), "NVIDIA")) + return true; + return false; +} + OptionSet AcceleratedBackingStoreDMABuf::rendererBufferMode() { static OptionSet mode; @@ -70,6 +95,9 @@ OptionSet AcceleratedBackingStoreDMABuf::rendererBuffe return; } + if (isNVIDIA()) + return; + mode.add(DMABufRendererBufferMode::SharedMemory); const auto& eglExtensions = WebCore::PlatformDisplay::sharedDisplay().eglExtensions(); -- 2.30.2