From d09c80e7c2f6dcac5888bb8fda549449d5372bd3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 3 Aug 2022 15:37:30 -0400
Subject: [PATCH] Reenable Wayland for matrox and aspeed

Resolves: #2097308
---
 0004-data-Use-latest-upstream-udev-rules.patch | 16 +---------------
 gdm.spec                                       |  6 +++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/0004-data-Use-latest-upstream-udev-rules.patch b/0004-data-Use-latest-upstream-udev-rules.patch
index bf526be..fca1f4a 100644
--- a/0004-data-Use-latest-upstream-udev-rules.patch
+++ b/0004-data-Use-latest-upstream-udev-rules.patch
@@ -16,7 +16,7 @@ diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
 index b1da191f..5dae00ea 100644
 --- a/data/61-gdm.rules.in
 +++ b/data/61-gdm.rules.in
-@@ -1,6 +1,137 @@
+@@ -1,6 +1,123 @@
 +# identify virtio graphics cards to find passthrough setups
 +SUBSYSTEM!="virtio", GOTO="gdm_virtio_device_end"
 +ACTION!="add", GOTO="gdm_virtio_device_end"
@@ -40,20 +40,6 @@ index b1da191f..5dae00ea 100644
 -DRIVER=="nvidia", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
 +ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
 +
-+# disable Wayland on Matrox chipsets
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", GOTO="gdm_disable_wayland"
-+
-+# disable Wayland on aspeed chipsets
-+ATTR{vendor}=="0x1a03", ATTR{device}=="0x2010", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", GOTO="gdm_disable_wayland"
-+
 +LABEL="gdm_pci_device_end"
 +
  # disable Wayland if modesetting is disabled
diff --git a/gdm.spec b/gdm.spec
index 3fa2564..43bc679 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -11,7 +11,7 @@
 Name: gdm
 Epoch: 1
 Version: 40.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -345,6 +345,10 @@ dconf update || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Tue Apr 12 2022 Ray Strode <rstrode@redhat.com> - 40.1-16
+- Reenable Wayland for matrox and aspeed
+  Resolves: #2097308
+
 * Tue Apr 12 2022 Ray Strode <rstrode@redhat.com> - 40.1-15
 - Fix accountsservice user templates
   Resolves: #2062827