From 985cc7a51b8b490d08c872b4bc353d36119cbd42 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 27 2021 00:14:31 +0000
Subject: import gdm-3.28.3-38.el8


---

diff --git a/SOURCES/0001-Stop-disabling-Wayland-for-server-GPUs.patch b/SOURCES/0001-Stop-disabling-Wayland-for-server-GPUs.patch
deleted file mode 100644
index 1886e88..0000000
--- a/SOURCES/0001-Stop-disabling-Wayland-for-server-GPUs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c784b38694199f4f201851a56a4a24f78cfd3183 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Tue, 10 Nov 2020 19:07:59 +0100
-Subject: [PATCH] Stop disabling Wayland for server GPUs
-
-Mutter can now handle tiled ad-hoc damage discovery, which should
-minimize any performance differences from the Xorg session.
----
- data/61-gdm.rules.in | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index f971224c..2b1ef3ad 100644
---- a/data/61-gdm.rules.in
-+++ b/data/61-gdm.rules.in
-@@ -1,17 +1,3 @@
--# disable Wayland on Matrox chipsets
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="@libexecdir@/gdm-disable-wayland"
--
--# disable Wayland on aspeed chipsets
--ATTR{vendor}=="0x1a03", ATTR{device}=="0x2010", RUN+="@libexecdir@/gdm-disable-wayland"
--ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", RUN+="@libexecdir@/gdm-disable-wayland"
--
- # disable Wayland when using the proprietary nvidia driver
- DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland"
- 
--- 
-2.28.0
-
diff --git a/SPECS/gdm.spec b/SPECS/gdm.spec
index 18e8c64..1618607 100644
--- a/SPECS/gdm.spec
+++ b/SPECS/gdm.spec
@@ -10,7 +10,7 @@
 Name: gdm
 Epoch: 1
 Version: 3.28.3
-Release: 37%{?dist}
+Release: 38%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -116,8 +116,6 @@ Patch300003: 0003-xdmcp-display-factory-Clear-launch-environment-when-.patch
 
 Patch900001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
 
-Patch1000001: 0001-Stop-disabling-Wayland-for-server-GPUs.patch
-
 BuildRequires: pam-devel >= 0:%{pam_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libtool automake autoconf
@@ -421,6 +419,10 @@ fi
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Tue Nov 10 2020 Jonas Ådahl <jadahl@redhat.com> - 3.28.3-38
+- Re-add disabling Wayland for server GPUs
+  Related: #1670273
+
 * Tue Nov 10 2020 Jonas Ådahl <jadahl@redhat.com> - 3.28.3-35
 - Stop disabling Wayland for server GPUs
   Related: #1670273