Update to 44.0
Refresh nvidia on wayland patch. Use SPDX for license field.
This commit is contained in:
David King
parent
12dc411224
commit
ee2e046a6d
1
.gitignore
vendored
1
.gitignore
vendored
@ -143,3 +143,4 @@ gdm-2.30.2.tar.bz2
|
||||
/gdm-41.3.tar.xz
|
||||
/gdm-42.0.tar.xz
|
||||
/gdm-43.0.tar.xz
|
||||
/gdm-44.0.tar.xz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From cb060ca0b0feaf9f2e4679482d64107f11b411d3 Mon Sep 17 00:00:00 2001
|
||||
From: Iker Pedrosa <ipedrosa@redhat.com>
|
||||
Date: Mon, 6 Feb 2023 12:52:27 +0100
|
||||
Subject: [PATCH] pam-redhat: Remove pam_console from service files
|
||||
|
||||
pam_console is being removed as it was replaced by ConsoleKit. The
|
||||
changes in this commit just remove pam_console from the service files.
|
||||
|
||||
If you are curious about the removal check the Fedora System-Wide Change
|
||||
proposal linked below.
|
||||
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1822228
|
||||
Relates: https://fedoraproject.org/wiki/Changes/RemovePamConsole
|
||||
Relates: https://bugzilla.redhat.com/show_bug.cgi?id=2166692
|
||||
|
||||
Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
|
||||
---
|
||||
data/pam-redhat/gdm-autologin.pam | 1 -
|
||||
data/pam-redhat/gdm-fingerprint.pam | 1 -
|
||||
data/pam-redhat/gdm-password.pam | 1 -
|
||||
data/pam-redhat/gdm-smartcard.pam | 1 -
|
||||
4 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/data/pam-redhat/gdm-autologin.pam b/data/pam-redhat/gdm-autologin.pam
|
||||
index c31ff27a8..97a4a137a 100644
|
||||
--- a/data/pam-redhat/gdm-autologin.pam
|
||||
+++ b/data/pam-redhat/gdm-autologin.pam
|
||||
@@ -7,7 +7,6 @@ account include system-auth
|
||||
password include system-auth
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_console.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
diff --git a/data/pam-redhat/gdm-fingerprint.pam b/data/pam-redhat/gdm-fingerprint.pam
|
||||
index 1483cdfff..628568ec3 100644
|
||||
--- a/data/pam-redhat/gdm-fingerprint.pam
|
||||
+++ b/data/pam-redhat/gdm-fingerprint.pam
|
||||
@@ -8,7 +8,6 @@ password include fingerprint-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_console.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
diff --git a/data/pam-redhat/gdm-password.pam b/data/pam-redhat/gdm-password.pam
|
||||
index 21c04ec1b..c75da0077 100644
|
||||
--- a/data/pam-redhat/gdm-password.pam
|
||||
+++ b/data/pam-redhat/gdm-password.pam
|
||||
@@ -11,7 +11,6 @@ password substack password-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_console.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
diff --git a/data/pam-redhat/gdm-smartcard.pam b/data/pam-redhat/gdm-smartcard.pam
|
||||
index 5024e52b6..3264a71cf 100644
|
||||
--- a/data/pam-redhat/gdm-smartcard.pam
|
||||
+++ b/data/pam-redhat/gdm-smartcard.pam
|
||||
@@ -8,7 +8,6 @@ password include smartcard-auth
|
||||
|
||||
session required pam_selinux.so close
|
||||
session required pam_loginuid.so
|
||||
-session optional pam_console.so
|
||||
session required pam_selinux.so open
|
||||
session optional pam_keyinit.so force revoke
|
||||
session required pam_namespace.so
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From c8032c7835381278ad0a3a5de695237d6885d649 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Thu, 2 Mar 2023 14:38:16 -0500
|
||||
Subject: [PATCH] udev: Drop duplicated line
|
||||
|
||||
commit 72bde3b3f474135e792c6c4e40932d7c82f87985 accidentally added
|
||||
two checks for virtio pci devices. The latter check is too broad
|
||||
and could potentially match non-graphics cards.
|
||||
|
||||
This commit drops it.
|
||||
---
|
||||
data/61-gdm.rules.in | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
|
||||
index b829a46f8..b5a0144dd 100644
|
||||
--- a/data/61-gdm.rules.in
|
||||
+++ b/data/61-gdm.rules.in
|
||||
@@ -9,7 +9,6 @@ ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4"
|
||||
ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
# qxl
|
||||
ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
|
||||
# disable Wayland on Hi1710 chipsets
|
||||
ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
From 500404b383c3d6a06e6bebd5f060f480c445df9e Mon Sep 17 00:00:00 2001
|
||||
From 32cabdadde5e272a8f045208fe4af1d47e4c3854 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 27 Sep 2022 10:00:11 -0400
|
||||
Subject: [PATCH 1/2] udev: Stick with wayland on hybrid nvidia with vendor
|
||||
driver
|
||||
Subject: [PATCH] udev: Stick with wayland on hybrid nvidia with vendor driver
|
||||
|
||||
F36 defaulted to wayland for users with hybrid graphics that
|
||||
use the vendor nvidia driver.
|
||||
@ -14,38 +13,11 @@ commit brings that behavior back.
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
|
||||
index 5bc9941c..d13f0b8b 100644
|
||||
index a4f841bdf..addfc3119 100644
|
||||
--- a/data/61-gdm.rules.in
|
||||
+++ b/data/61-gdm.rules.in
|
||||
@@ -57,66 +57,68 @@ TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
|
||||
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\""
|
||||
ENV{NVIDIA_PRESERVE_VIDEO_MEMORY_ALLOCATIONS}!="1", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_HIBERNATE=`systemctl is-enabled nvidia-hibernate`'"
|
||||
ENV{NVIDIA_HIBERNATE}!="enabled", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_RESUME=`systemctl is-enabled nvidia-resume`'"
|
||||
ENV{NVIDIA_RESUME}!="enabled", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_SUSPEND=`systemctl is-enabled nvidia-suspend`'"
|
||||
ENV{NVIDIA_SUSPEND}!="enabled", GOTO="gdm_disable_wayland"
|
||||
LABEL="gdm_nvidia_end"
|
||||
|
||||
# If this machine has an internal panel, take note, since it's probably a laptop
|
||||
# FIXME: It could be "ghost connectors" make this pop positive for some workstations
|
||||
# in the wild. If so, we may have to fallback to looking at the chassis type from
|
||||
# dmi data or acpi
|
||||
KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
|
||||
SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
|
||||
ACTION!="add", GOTO="gdm_laptop_check_end"
|
||||
RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
|
||||
GOTO="gdm_hybrid_nvidia_laptop_check"
|
||||
LABEL="gdm_laptop_check_end"
|
||||
|
||||
# If this is a hybrid graphics setup, take note
|
||||
KERNEL!="card[1-9]*", GOTO="gdm_hybrid_graphics_check_end"
|
||||
KERNEL=="card[1-9]-*", GOTO="gdm_hybrid_graphics_check_end"
|
||||
SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
|
||||
ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
|
||||
RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
||||
@@ -82,12 +82,14 @@ ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machi
|
||||
ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
||||
LABEL="gdm_hybrid_graphics_check_end"
|
||||
|
||||
-# If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
|
||||
@ -61,33 +33,6 @@ index 5bc9941c..d13f0b8b 100644
|
||||
LABEL="gdm_hybrid_nvidia_laptop_check_end"
|
||||
|
||||
# Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
|
||||
LABEL="gdm_virt_passthrough_check"
|
||||
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_passthrough_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_passthrough_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_passthrough_check_end"
|
||||
GOTO="gdm_disable_wayland"
|
||||
LABEL="gdm_virt_passthrough_check_end"
|
||||
|
||||
# Disable wayland when there are multiple virtual gpus
|
||||
LABEL="gdm_virt_multi_gpu_check"
|
||||
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
TEST=="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
LABEL="gdm_virt_multi_gpu_check_end"
|
||||
|
||||
# Disable wayland when nvidia modeset is disabled or when drivers are a lower
|
||||
# version than 470,
|
||||
# For versions above 470 but lower than 510 prefer Xorg,
|
||||
# Above 510, prefer Wayland.
|
||||
KERNEL!="nvidia_drm", GOTO="gdm_nvidia_drm_end"
|
||||
SUBSYSTEM!="module", GOTO="gdm_nvidia_drm_end"
|
||||
ACTION!="add", GOTO="gdm_nvidia_drm_end"
|
||||
# disable wayland if nvidia-drm modeset is not enabled
|
||||
ATTR{parameters/modeset}!="Y", GOTO="gdm_disable_wayland"
|
||||
# disable wayland for nvidia drivers versions lower than 470
|
||||
ATTR{version}=="4[0-6][0-9].*|[0-3][0-9][0-9].*|[0-9][0-9].*|[0-9].*", GOTO="gdm_disable_wayland"
|
||||
# For nvidia drivers versions Above 510, keep Wayland by default
|
||||
ATTR{version}=="[5-9][1-9][0-9].*", GOTO="gdm_end"
|
||||
--
|
||||
2.39.2
|
||||
2.40.0
|
||||
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
From f89343fc35aaa2418550f02955bfdd971791db1e Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 1 Mar 2023 22:50:49 -0500
|
||||
Subject: [PATCH 2/2] udev: Try to detect virtual graphics and EFI better
|
||||
|
||||
With EFI and simpledrm we may end up booting without a card0 but
|
||||
with a card1 drm device. This defeats GDM's simplistic hybrid
|
||||
graphics check.
|
||||
|
||||
Also, our detection for virtio graphics wasn't working so well, because
|
||||
it wrote the results into an environment variable of a non-parent
|
||||
device.
|
||||
|
||||
This commit gets the detection logic working better for virt/efi setups.
|
||||
---
|
||||
data/61-gdm.rules.in | 19 +++++++++----------
|
||||
1 file changed, 9 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
|
||||
index d13f0b8b..423f89cb 100644
|
||||
--- a/data/61-gdm.rules.in
|
||||
+++ b/data/61-gdm.rules.in
|
||||
@@ -1,114 +1,113 @@
|
||||
-# identify virtio graphics cards to find passthrough setups
|
||||
-SUBSYSTEM!="virtio", GOTO="gdm_virtio_device_end"
|
||||
-ACTION!="add", GOTO="gdm_virtio_device_end"
|
||||
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x0010", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_virtio_device_end"
|
||||
-LABEL="gdm_virtio_device_end"
|
||||
-
|
||||
SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
|
||||
-ACTION!="bind", GOTO="gdm_pci_device_end"
|
||||
+ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
|
||||
|
||||
# identify virtio graphics cards to find passthrough setups
|
||||
# cirrus
|
||||
ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
+ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
# vga
|
||||
ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
# qxl
|
||||
ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
+ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
|
||||
|
||||
# disable Wayland on Hi1710 chipsets
|
||||
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
|
||||
KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end"
|
||||
+KERNEL=="card[0-9]-*", GOTO="gdm_nomodeset_end"
|
||||
SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
|
||||
-IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
|
||||
-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
|
||||
# but keep it enabled for simple framebuffer drivers
|
||||
DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
|
||||
+IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
|
||||
+ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
|
||||
IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
|
||||
LABEL="gdm_nomodeset_end"
|
||||
|
||||
# The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
|
||||
# informed choice on which way to proceed, so force GDM to wait until NVidia's modules are
|
||||
# loaded before starting up.
|
||||
KERNEL!="nvidia", GOTO="gdm_nvidia_end"
|
||||
SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
|
||||
ACTION!="add", GOTO="gdm_nvidia_end"
|
||||
RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
|
||||
|
||||
# Check if suspend/resume services necessary for working wayland support is available
|
||||
TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
|
||||
TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\""
|
||||
ENV{NVIDIA_PRESERVE_VIDEO_MEMORY_ALLOCATIONS}!="1", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_HIBERNATE=`systemctl is-enabled nvidia-hibernate`'"
|
||||
ENV{NVIDIA_HIBERNATE}!="enabled", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_RESUME=`systemctl is-enabled nvidia-resume`'"
|
||||
ENV{NVIDIA_RESUME}!="enabled", GOTO="gdm_disable_wayland"
|
||||
IMPORT{program}="/bin/sh -c 'echo NVIDIA_SUSPEND=`systemctl is-enabled nvidia-suspend`'"
|
||||
ENV{NVIDIA_SUSPEND}!="enabled", GOTO="gdm_disable_wayland"
|
||||
LABEL="gdm_nvidia_end"
|
||||
|
||||
# If this machine has an internal panel, take note, since it's probably a laptop
|
||||
# FIXME: It could be "ghost connectors" make this pop positive for some workstations
|
||||
# in the wild. If so, we may have to fallback to looking at the chassis type from
|
||||
# dmi data or acpi
|
||||
KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
|
||||
SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
|
||||
ACTION!="add", GOTO="gdm_laptop_check_end"
|
||||
RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
|
||||
GOTO="gdm_hybrid_nvidia_laptop_check"
|
||||
LABEL="gdm_laptop_check_end"
|
||||
|
||||
# If this is a hybrid graphics setup, take note
|
||||
KERNEL!="card[1-9]*", GOTO="gdm_hybrid_graphics_check_end"
|
||||
KERNEL=="card[1-9]-*", GOTO="gdm_hybrid_graphics_check_end"
|
||||
SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
|
||||
ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
|
||||
-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
||||
+IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
|
||||
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
|
||||
+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
|
||||
LABEL="gdm_hybrid_graphics_check_end"
|
||||
|
||||
# If this is a hybrid graphics laptop with vendor nvidia driver default to wayland
|
||||
# It gives poor performance for multi-monitor, but Xorg fails some multi-monitor
|
||||
# setups too, and this is what we did in F36.
|
||||
LABEL="gdm_hybrid_nvidia_laptop_check"
|
||||
TEST!="/run/udev/gdm-machine-is-laptop", GOTO="gdm_hybrid_nvidia_laptop_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_hybrid_nvidia_laptop_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-vendor-nvidia-driver", GOTO="gdm_hybrid_nvidia_laptop_check_end"
|
||||
GOTO="gdm_end"
|
||||
LABEL="gdm_hybrid_nvidia_laptop_check_end"
|
||||
|
||||
# Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
|
||||
LABEL="gdm_virt_passthrough_check"
|
||||
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_passthrough_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_passthrough_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_passthrough_check_end"
|
||||
GOTO="gdm_disable_wayland"
|
||||
LABEL="gdm_virt_passthrough_check_end"
|
||||
|
||||
# Disable wayland when there are multiple virtual gpus
|
||||
LABEL="gdm_virt_multi_gpu_check"
|
||||
TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
TEST!="/run/udev/gdm-machine-has-virtual-gpu", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
TEST=="/run/udev/gdm-machine-has-hardware-gpu", GOTO="gdm_virt_multi_gpu_check_end"
|
||||
LABEL="gdm_virt_multi_gpu_check_end"
|
||||
|
||||
# Disable wayland when nvidia modeset is disabled or when drivers are a lower
|
||||
# version than 470,
|
||||
# For versions above 470 but lower than 510 prefer Xorg,
|
||||
--
|
||||
2.39.2
|
||||
|
||||
23
gdm.spec
23
gdm.spec
@ -10,13 +10,13 @@
|
||||
|
||||
Name: gdm
|
||||
Epoch: 1
|
||||
Version: 43.0
|
||||
Release: 7%{?dist}
|
||||
Version: 44.0
|
||||
Release: 1%{?dist}
|
||||
Summary: The GNOME Display Manager
|
||||
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://wiki.gnome.org/Projects/GDM
|
||||
Source0: http://download.gnome.org/sources/gdm/43/gdm-%{tarball_version}.tar.xz
|
||||
Source0: https://download.gnome.org/sources/gdm/44/gdm-%{tarball_version}.tar.xz
|
||||
Source1: org.gnome.login-screen.gschema.override
|
||||
|
||||
# moved here from pulseaudio-gdm-hooks-11.1-16
|
||||
@ -24,20 +24,8 @@ Source5: default.pa-for-gdm
|
||||
|
||||
Source6: gdm.sysusers
|
||||
|
||||
# pam_console removal
|
||||
Patch10001: 0001-pam-redhat-Remove-pam_console-from-service-files.patch
|
||||
|
||||
# Downstream patches
|
||||
Patch70001: 0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
|
||||
# This is an upstream patch, but it is rediffed on the above downstream
|
||||
# patch and must be applied after it
|
||||
# Fix things so we get Wayland on UEFI VMs
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2172291
|
||||
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/198
|
||||
Patch70002: 0002-udev-Try-to-detect-virtual-graphics-and-EFI-better.patch
|
||||
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/199
|
||||
# Follow-up to the above to fix an erroneously-added line
|
||||
Patch70003: 0001-udev-Drop-duplicated-line.patch
|
||||
|
||||
Patch80001: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
|
||||
Patch90001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
|
||||
@ -314,6 +302,9 @@ fi
|
||||
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
|
||||
|
||||
%changelog
|
||||
* Fri Mar 31 2023 David King <amigadave@amigadave.com> - 44.0-1
|
||||
- Update to 44.0
|
||||
|
||||
* Thu Mar 02 2023 Adam Williamson <awilliam@redhat.com> - 43.0-7
|
||||
- Backport MR #199 to fix up a mistake in the virt efi patch
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gdm-43.0.tar.xz) = e3eaa7a50e224939b6e535963171a800bb175ed9480a88ce14034929760dd579b91c4f3117be6a4404b2de13afdee881dafe09695eebf42872d4a13fbc5fb8ba
|
||||
SHA512 (gdm-44.0.tar.xz) = eab556d0cab43ce4fe04b918f22281831f1dd8de836866de009884a637f11c83a626cdedb46cee5efb53cf1ad8139aa6e9568fd90a4d01704605347deca7bc2c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user