1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From: Carlos Garcia Campos <cgarcia@igalia.com>
Subject: 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
diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
index 8345d7f789d1..0964ee590266 100644
--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.cpp
@@ -39,9 +39,11 @@
#include <WebCore/IntRect.h>
#include <WebCore/NativeImage.h>
#include <WebCore/PlatformDisplay.h>
+#include <WebCore/PlatformDisplaySurfaceless.h>
#include <WebCore/ShareableBitmap.h>
#include <WebCore/SharedMemory.h>
#include <epoxy/egl.h>
+#include <fcntl.h>
#include <gtk/gtk.h>
#include <wtf/TZoneMallocInlines.h>
#include <wtf/glib/GUniquePtr.h>
@@ -54,6 +56,7 @@
#if USE(GBM)
#include <WebCore/DRMDeviceManager.h>
#include <WebCore/GBMDevice.h>
+#include <WebCore/PlatformDisplayGBM.h>
#include <gbm.h>
static constexpr uint64_t s_dmabufInvalidModifier = DRM_FORMAT_MOD_INVALID;
@@ -79,6 +82,54 @@ using namespace WebCore;
WTF_MAKE_TZONE_ALLOCATED_IMPL(AcceleratedBackingStore);
+static bool isNVIDIA()
+{
+ const char* forceDMABuf = getenv("WEBKIT_FORCE_DMABUF_RENDERER");
+ if (forceDMABuf && *forceDMABuf != '0')
+ return false;
+
+ std::unique_ptr<PlatformDisplay> platformDisplay;
+#if USE(GBM)
+ UnixFileDescriptor fd;
+ struct gbm_device* device = nullptr;
+ const char* disableGBM = getenv("WEBKIT_DMABUF_RENDERER_DISABLE_GBM");
+ if (!disableGBM || *disableGBM == '0') {
+ auto drmDevice = drmMainDevice();
+ if (!drmDevice.isNull()) {
+ const auto& filename = !drmDevice.renderNode.isNull() ? drmDevice.renderNode : drmDevice.primaryNode;
+ fd = UnixFileDescriptor { open(filename.data(), O_RDWR | O_CLOEXEC), UnixFileDescriptor::Adopt };
+ if (fd) {
+ device = gbm_create_device(fd.value());
+ if (device)
+ platformDisplay = PlatformDisplayGBM::create(device);
+ }
+ }
+ }
+#endif
+ if (!platformDisplay)
+ platformDisplay = PlatformDisplaySurfaceless::create();
+
+ bool returnValue = false;
+ GLDisplay* glDisplay = platformDisplay ? &platformDisplay->glDisplay() : Display::singleton().glDisplay();
+ if (glDisplay) {
+ auto targetType = platformDisplay && platformDisplay->type() == PlatformDisplay::Type::Surfaceless ? GLContext::Target::Surfaceless : GLContext::Target::Default;
+ GLContext::ScopedGLContext glContext(GLContext::create(*glDisplay, targetType, nullptr));
+ const char* glVendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+ if (glVendor && strstr(glVendor, "NVIDIA"))
+ returnValue = true;
+ }
+
+ if (platformDisplay)
+ platformDisplay->clearGLContexts();
+
+#if USE(GBM)
+ if (device)
+ gbm_device_destroy(device);
+#endif
+
+ return returnValue;
+}
+
OptionSet<RendererBufferTransportMode> AcceleratedBackingStore::rendererBufferTransportMode()
{
static OptionSet<RendererBufferTransportMode> mode;
@@ -94,6 +145,9 @@ OptionSet<RendererBufferTransportMode> AcceleratedBackingStore::rendererBufferTr
return;
}
+ if (isNVIDIA())
+ return;
+
mode.add(RendererBufferTransportMode::SharedMemory);
const char* forceSHM = getenv("WEBKIT_DMABUF_RENDERER_FORCE_SHM");
|
