rpms/gdm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

avoid wayland if nomodeset is on kernel command line

Browse Source 
Related: #1691909
This commit is contained in:
Ray Strode 2019-04-15 10:57:01 -04:00
parent 01e7f7e9a5
commit bb090eb3b6
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-data-disable-wayland-if-modesetting-is-disabled.patch Normal file
View File

@ -0,0 +1,30 @@
From a0f3d7108f688d48ad8653c380dba575fcd2fc3f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 15 Apr 2019 10:53:25 -0400
Subject: [PATCH] data: disable wayland if modesetting is disabled
wayland requires working modesetting, so don't even
bother trying it if modesetting is disabled.
This is more efficient and side-steps a bug in the fallback
logic if start up is unreasonably slow.
---
data/61-gdm.rules.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index ad5b87d4c..ebdbfe9c1 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -1,6 +1,8 @@
# disable Wayland on Cirrus chipsets
ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
# disable Wayland on Hi1710 chipsets
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
# disable Wayland when using the proprietary nvidia driver
DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland"
+# disable Wayland if modesetting is disabled
+IMPORT{cmdline}="nomodeset", RUN+="@libexecdir@/gdm-disable-wayland"
--
2.20.1

8
gdm.spec
View File

@ -10,7 +10,7 @@
Name: gdm
Epoch: 1
Version: 3.32.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: The GNOME Display Manager
License: GPLv2+
@ -19,6 +19,8 @@ Source0: http://download.gnome.org/sources/gdm/3.30/gdm-%{version}.tar.xz
Source1: org.gnome.login-screen.gschema.override
Patch0: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
Patch10001: 0001-data-disable-wayland-if-modesetting-is-disabled.patch
Patch99: system-dconf.patch
BuildRequires: pam-devel >= 0:%{pam_version}
@ -311,6 +313,10 @@ fi
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog
* Mon Apr 15 2019 Ray Strode <rstrode@redhat.com> - 1:3.32.0-3
- avoid wayland if nomodeset is on kernel command line
Related: #1691909
* Mon Apr 15 2019 Ray Strode <rstrode@redhat.com> - 1:3.32.0-2
- Drop CanGraphical patch for now. It's causing problems.
Resolves: #1683197