diff --git a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
new file mode 100644
index 0000000..be3f2dc
--- /dev/null
+++ b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
@@ -0,0 +1,33 @@
+From fdd8a6f6760034707428554f50c09db2c5f2efcb Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Tue, 9 Mar 2021 17:21:59 -0800
+Subject: [PATCH] Test: deny atomic KMS for "tegra" (RHBZ #1936991)
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ data/61-mutter.rules                  | 1 +
+ src/backends/native/meta-kms-device.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/61-mutter.rules b/data/61-mutter.rules
+index 59cc00007c..f04e536f80 100644
+--- a/data/61-mutter.rules
++++ b/data/61-mutter.rules
+@@ -1 +1,2 @@
+ DRIVER=="tegra-host1x", SUBSYSTEM=="platform", TAG+="mutter-device-requires-kms-modifiers"
++DRIVER=="tegra", SUBSYSTEM=="platform", TAG+="mutter-device-disable-atomic-kms"
+diff --git a/src/backends/native/meta-kms-device.c b/src/backends/native/meta-kms-device.c
+index b5b50d602c..f86ca2ab56 100644
+--- a/src/backends/native/meta-kms-device.c
++++ b/src/backends/native/meta-kms-device.c
+@@ -246,6 +246,7 @@ is_atomic_allowed (const char *driver_name)
+     "vmwgfx",
+     "vboxvideo",
+     "nvidia-drm",
++    "tegra",
+     NULL,
+   };
+ 
+-- 
+2.30.1
+
diff --git a/mutter.spec b/mutter.spec
index 8589637..a2a05c0 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -8,7 +8,7 @@
 
 Name:          mutter
 Version:       40.0~beta
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -22,6 +22,9 @@ Patch0:        0001-window-actor-Special-case-shaped-Java-windows.patch
 # To make s390x build pass
 Patch1:        0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch
 
+# Workaround for RHBZ#1936991 (blocks atomic KMS on "tegra" driver)
+Patch2:        0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch
+
 BuildRequires: chrpath
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -168,6 +171,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/mutter-%{mutter_api_version}/tests
 
 %changelog
+* Tue Mar 09 2021 Adam Williamson <awilliam@redhat.com> - 40.0~beta-2
+- Add a workaround for RHBZ#1936991 (disable atomic KMS on tegra)
+
 * Mon Feb 22 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-1
 - Update to 40.beta