From 25748b1418d1662386a7460f1d4e55acc8b295e2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 11 Jan 2023 09:33:17 -0500 Subject: [PATCH] Revert "Disable Wayland on aspeed" This reverts commit a90e4d6a658bd60f475aeb999ee7bfb3e220c1b9. Resolves: #2131203 --- 0004-data-Use-latest-upstream-udev-rules.patch | 5 +---- gdm.spec | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/0004-data-Use-latest-upstream-udev-rules.patch b/0004-data-Use-latest-upstream-udev-rules.patch index a3da48e..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,126 @@ +@@ -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,9 +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 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 9cc0388..8018a17 100644 --- a/gdm.spec +++ b/gdm.spec @@ -11,7 +11,7 @@ Name: gdm Epoch: 1 Version: 40.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: The GNOME Display Manager License: GPLv2+ @@ -347,6 +347,10 @@ dconf update || : %{_libdir}/pkgconfig/gdm-pam-extensions.pc %changelog +* Wed Jan 11 2023 Ray Strode - 40.1-19 +- Re-enable Wayland on aspeed + Resolves: #2131203 + * Wed Nov 02 2022 Ray Strode - 40.1-18 - Fix btmp accounting Resolves: #2073275