systemd/{mutter,gdm,gnome-shell,gnome-settings-daemon}: upgrade to 48.0

extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch

@@ -14,7 +14,7 @@ diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
 index a4f841bdf..481c5b4dd 100644
 --- a/data/61-gdm.rules.in
 +++ b/data/61-gdm.rules.in
-@@ -2,13 +2,13 @@ SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
+@@ -2,13 +2,13 @@
  ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
  
  # cirrus
@@ -32,25 +32,26 @@ index a4f841bdf..481c5b4dd 100644
  
  # disable Wayland on Hi1710 chipsets
  ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
-@@ -36,7 +36,7 @@ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
- # but keep it enabled for simple framebuffer drivers
- DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
+@@ -21,7 +21,7 @@
+ SUBSYSTEM!="drm", GOTO="gdm_hardware_gpu_end"
+ DRIVERS=="simple-framebuffer", GOTO="gdm_hardware_gpu_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"
 +ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
- IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
- LABEL="gdm_nomodeset_end"
+ LABEL="gdm_hardware_gpu_end"
  
-@@ -46,7 +46,7 @@ LABEL="gdm_nomodeset_end"
+ # The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
+@@ -30,7 +30,7 @@
  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"
 +RUN+="/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"
-@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
+ # Import nvidia kernel parameters
+ 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\""
+@@ -59,8 +59,8 @@
+ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
  ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
  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"
@@ -59,7 +60,4 @@ index a4f841bdf..481c5b4dd 100644
 +ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/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
--- 
-2.39.2
-
+ # Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu