From 4be27bb7af495a0f0e08cd7c889ff23365873b52 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 14 Jun 2021 17:36:56 +0200
Subject: Added fix for mozbz#1646135 - Disabled Wayland/Webrender on NVIDIA
 drivers

---
 firefox.spec          |  7 ++++++-
 mozilla-1646135.patch | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1646135.patch

diff --git a/firefox.spec b/firefox.spec
index 04b55c8..f933c82 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -152,7 +152,7 @@ ExcludeArch: armv7hl
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        89.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -233,6 +233,7 @@ Patch408:        mozilla-1663844.patch
 Patch415:        mozilla-1670333.patch
 Patch420:        mochitest-wayland-workaround.patch
 Patch422:        mozilla-1705048.patch
+Patch423:        mozilla-1646135.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -470,6 +471,7 @@ This package contains results of tests executed during build.
 %patch415 -p1 -b .1670333
 %patch420 -p1 -b .mochitest-wayland-workaround
 %patch422 -p1 -b .1705048
+%patch423 -p1 -b .1646135
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1025,6 +1027,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jun 14 2021 Martin Stransky <stransky@redhat.com> - 89.0-2
+- Added fix for mozbz#1646135
+
 * Tue Jun 1 2021 Martin Stransky <stransky@redhat.com> - 89.0-1
 - Updated to latest upstream (89.0)
 
diff --git a/mozilla-1646135.patch b/mozilla-1646135.patch
new file mode 100644
index 0000000..3fef2cf
--- /dev/null
+++ b/mozilla-1646135.patch
@@ -0,0 +1,21 @@
+diff --git a/widget/gtk/GfxInfo.cpp b/widget/GfxInfoX11.cpp
+--- a/widget/GfxInfoX11.cpp
++++ b/widget/GfxInfoX11.cpp
+@@ -674,6 +674,16 @@
+         nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_LESS_THAN, V(460, 32, 3, 0),
+         "FEATURE_FAILURE_WEBRENDER_OLD_NVIDIA", "460.32.03");
+ 
++    // Disable Nvidia proprietary drivers on Wayland.
++    APPEND_TO_DRIVER_BLOCKLIST_EXT(
++        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
++        DesktopEnvironment::All, WindowProtocol::Wayland,
++        DriverVendor::NonMesaAll, DeviceFamily::NvidiaAll,
++        nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_BLOCKED_DEVICE,
++        DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
++        "FEATURE_FAILURE_WEBRENDER_NVIDIA_WAYLAND",
++        "https://bugzilla.mozilla.org/show_bug.cgi?id=1646135");
++
+     // ATI Mesa baseline, chosen arbitrarily.
+     APPEND_TO_DRIVER_BLOCKLIST_EXT(
+         OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+
-- 
cgit