Revert "Disable Wayland on aspeed"

This reverts commit a90e4d6a65.

Resolves: #2131203
This commit is contained in:
Ray Strode 2023-01-11 09:33:17 -05:00
parent 36f981b7ae
commit 25748b1418
2 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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 <rstrode@redhat.com> - 40.1-19
- Re-enable Wayland on aspeed
Resolves: #2131203
* Wed Nov 02 2022 Ray Strode <rstrode@redhat.com> - 40.1-18
- Fix btmp accounting
Resolves: #2073275