Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package suse-prime for openSUSE:Factory checked in at 2021-09-15 22:51:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-prime (Old) and /work/SRC/openSUSE:Factory/.suse-prime.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-prime" Wed Sep 15 22:51:37 2021 rev:28 rq:919256 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-prime/suse-prime.changes 2021-08-28 22:30:04.490035742 +0200 +++ /work/SRC/openSUSE:Factory/.suse-prime.new.1899/suse-prime.changes 2021-09-15 22:52:00.526951577 +0200 @@ -1,0 +2,10 @@ +Wed Sep 15 13:55:07 UTC 2021 - Stefan Dirsch <sndir...@suse.com> + +- SUSEPrime-0.8.2 + * 0.8.0 adds nvidia-prime-render offload support with both + modesetting and xf86-video-intel drivers. Massive changes! + --> https://github.com/openSUSE/SUSEPrime/releases/tag/0.8.0 + * 0.8.1/0.8.2 adds amd support (needed for AMD/NVIDIA combos) +- merged suse-prime/suse-prime-bbswitch packages + +------------------------------------------------------------------- Old: ---- SUSEPrime-0.7.17.tar.gz New: ---- SUSEPrime-0.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-prime.spec ++++++ --- /var/tmp/diff_new_pack.sAXCgP/_old 2021-09-15 22:52:01.102952265 +0200 +++ /var/tmp/diff_new_pack.sAXCgP/_new 2021-09-15 22:52:01.106952270 +0200 @@ -17,35 +17,25 @@ Name: suse-prime -Version: 0.7.17 +Version: 0.8.2 Release: 0 -Summary: GPU (nvidia/intel) selection for NVIDIA optimus laptops +Summary: GPU (nvidia/intel) selection for NVIDIA optimus laptops with bbswitch support License: SUSE-Public-Domain Group: System/X11/Utilities URL: https://github.com/openSUSE/SUSEPrime Source0: https://github.com/openSUSE/SUSEPrime/archive/%{version}.tar.gz#/SUSEPrime-%{version}.tar.gz +Recommends: bbswitch Recommends: nvidia_driver Supplements: modalias(nvidia_driver:pci:v00008086d*sv*sd*bc03sc*i*) Conflicts: suse-prime-alt -Conflicts: suse-prime-bbswitch -BuildArch: noarch - -%description -A collection of shell scripts that makes it possible to use the -NVIDIA GPU on a Optimus Laptop. The switching is similar to -the feature provided by the nvidia-prime package in Ubuntu. - -%package bbswitch -Summary: GPU (nvidia/intel) selection for NVIDIA optimus laptops with bbswitch support -Group: System/X11/Utilities +#Provides: suse-prime-bbswitch:/usr/lib/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf +Obsoletes: suse-prime-bbswitch < %{version} +Provides: suse-prime-bbswitch = %{version} BuildRequires: pkgconfig(systemd) -Requires: bbswitch -Conflicts: suse-prime -Conflicts: suse-prime-alt BuildArch: noarch %{?systemd_ordering} -%description bbswitch +%description A collection of shell scripts that makes it possible to use the NVIDIA GPU on a Optimus Laptop. The switching is similar to the feature provided by the nvidia-prime package in Ubuntu. @@ -63,6 +53,7 @@ install -m 0644 xorg-intel-intel.conf %{buildroot}%{_datadir}/prime/ install -m 0644 xorg-nvidia.conf %{buildroot}%{_datadir}/prime/ install -m 0644 xorg-nvidia-prime-render-offload.conf %{buildroot}%{_datadir}/prime/ +install -m 0644 xorg-amd.conf %{buildroot}%{_datadir}/prime/ mkdir -p %{buildroot}/usr/lib/modprobe.d install -m 0644 09-nvidia-modprobe-bbswitch-G04.conf %{buildroot}/usr/lib/modprobe.d/ install -m 0644 09-nvidia-modprobe-pm-G05.conf %{buildroot}/usr/lib/modprobe.d/ @@ -76,7 +67,16 @@ mkdir -p %{buildroot}/usr/sbin ln -snf service %{buildroot}/usr/sbin/rcprime-select +%pre +%service_add_pre prime-select.service + +%post +%{?regenerate_initrd_post} +%service_add_post prime-select.service +systemctl enable prime-select.service + %preun +%service_del_preun prime-select.service if [ "$1" -eq 0 ]; then # cleanup before uninstalling the package completely export PATH=$PATH:/usr/sbin @@ -87,6 +87,7 @@ if [ "$1" -eq 0 ]; then true %{?regenerate_initrd_post} + %service_del_postun prime-select.service fi %posttrans @@ -97,38 +98,13 @@ rm -f /etc/dracut.conf.d/50-nvidia-default.conf %{?regenerate_initrd_post} -%if 0%{?is_opensuse} -%pre bbswitch -%service_add_pre prime-select.service - -%post bbswitch -%{?regenerate_initrd_post} -%service_add_post prime-select.service -systemctl enable prime-select.service - -%preun bbswitch -%service_del_preun prime-select.service -if [ "$1" -eq 0 ]; then - # cleanup before uninstalling the package completely - export PATH=$PATH:/usr/sbin - %{_sbindir}/prime-select unset -fi -exit 0 - -%postun bbswitch -%{?regenerate_initrd_post} -%service_del_postun prime-select.service - -%posttrans bbswitch -%{?regenerate_initrd_posttrans} -%endif - %files %defattr(-,root,root) %doc README.md %dir /usr/lib/dracut/ %dir /usr/lib/dracut/dracut.conf.d/ %dir %{_datadir}/prime +%{_datadir}/prime/xorg-amd.conf %{_datadir}/prime/xorg-intel.conf %{_datadir}/prime/xorg-intel-intel.conf %{_datadir}/prime/xorg-nvidia.conf @@ -136,28 +112,11 @@ %ghost %dir %{_sysconfdir}/prime %ghost %config(noreplace) %{_sysconfdir}/prime/current_type %{_sbindir}/prime-select -%config /usr/lib/modprobe.d/09-nvidia-modprobe-pm-G05.conf +%{_sbindir}/rcprime-select +/usr/lib/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf +/usr/lib/modprobe.d/09-nvidia-modprobe-pm-G05.conf /usr/lib/dracut/dracut.conf.d/90-nvidia-dracut-G05.conf /usr/lib/udev/rules.d/90-nvidia-udev-pm-G05.rules - -%if 0%{?is_opensuse} -%files bbswitch -%doc README.md -%dir %{_datadir}/prime -%{_datadir}/prime/xorg-intel.conf -%{_datadir}/prime/xorg-intel-intel.conf -%{_datadir}/prime/xorg-nvidia.conf -%{_datadir}/prime/xorg-nvidia-prime-render-offload.conf -%ghost %dir %{_sysconfdir}/prime -%ghost %config(noreplace) %{_sysconfdir}/prime/current_type -%{_sbindir}/prime-select -%{_sbindir}/rcprime-select -%config /usr/lib/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf %{_unitdir}/prime-select.service -%else -%exclude %config /usr/lib/modprobe.d/09-nvidia-modprobe-bbswitch-G04.conf -%exclude %{_unitdir}/prime-select.service -%exclude %{_sbindir}/rcprime-select -%endif %changelog ++++++ SUSEPrime-0.7.17.tar.gz -> SUSEPrime-0.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.17/09-nvidia-modprobe-bbswitch-G04.conf new/SUSEPrime-0.8.2/09-nvidia-modprobe-bbswitch-G04.conf --- old/SUSEPrime-0.7.17/09-nvidia-modprobe-bbswitch-G04.conf 2021-03-08 16:55:43.000000000 +0100 +++ new/SUSEPrime-0.8.2/09-nvidia-modprobe-bbswitch-G04.conf 2021-09-07 10:17:29.000000000 +0200 @@ -4,4 +4,5 @@ blacklist nouveau blacklist ipmi_msghandler blacklist ipmi_devintf +blacklist bbswitch options nvidia-drm modeset=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.17/90-nvidia-dracut-G05.conf new/SUSEPrime-0.8.2/90-nvidia-dracut-G05.conf --- old/SUSEPrime-0.7.17/90-nvidia-dracut-G05.conf 2021-03-08 16:55:43.000000000 +0100 +++ new/SUSEPrime-0.8.2/90-nvidia-dracut-G05.conf 2021-09-07 10:17:29.000000000 +0200 @@ -1,5 +1,5 @@ # Omit the nvidia driver from the ramdisk, to avoid needing to regenerate # the ramdisk on updates, and to ensure the power-management udev rules run # on module load -omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm " +omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm bbswitch " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.17/README.md new/SUSEPrime-0.8.2/README.md --- old/SUSEPrime-0.7.17/README.md 2021-03-08 16:55:43.000000000 +0100 +++ new/SUSEPrime-0.8.2/README.md 2021-09-07 10:17:29.000000000 +0200 @@ -15,7 +15,7 @@ using the NVIDIA card. To switch back to te Intel card run `sudo prime-select intel` (modesetting driver) or `sudo prime-select intel2` (Intel Open Source driver, requires xf86-video-intel package). 2. To check which video card you're currently using run `/usr/sbin/prime-select get-current`. -3. In intel-only mode, powering off the NVIDIA card with bbswitch (since 390.xxx driver) or using DynamicPowerManagement option in nvidia/intel mode (since 435.xx driver and Turing GPU or later) to save power and decrease temperature is supported but requires additional manual setup. Refer to instructions below. +3. In intel-only mode, powering off the NVIDIA card with bbswitch (since 390.xxx driver) is supported. Using DynamicPowerManagement option in nvidia/intel mode (since 435.xx driver and Turing GPU or later) to save power and decrease temperature is supported but requires additional manual setup. Refer to instructions below. 4. Since 435.xx driver you can make use of NVIDIA's PRIME Render Offload feature in intel configurations (Xserver of Leap 15.2 or later needed!). `Option "AllowNVIDIAGPUScreens"` is already taken care of by intel X configs. You only need to set the __NV* environment variables. Check <https://download.nvidia.com/XFree86/Linux-x86_64/435.21/README/primerenderoffload.html> for more details. Contact @@ -23,6 +23,7 @@ * Bo Simonsen <b...@geekworld.dk> * Michal Srb <m...@suse.com> +* Simone Pilia <pilia.simon...@gmail.com> Related projects ---------------- @@ -60,6 +61,7 @@ ``` zypper in bbswitch ``` +* bbswitch module must be blacklisted, even in initrd, prime-select will load it only when needed ### Blacklist the NVIDIA modules so it can be loaded only when necessary @@ -75,7 +77,7 @@ This will also blacklist the `nouveau` module which can really get in the way with Optimus and causing black screens. -### Install the systemd services for doing switch and set correct card during boot +### Install the systemd services to set correct card during boot ``` if [ ! -s /usr/lib/systemd/system/prime-select.service ]; then @@ -84,9 +86,10 @@ fi ``` -If nvidia is set, it will load the NVIDIA modules before starting the Graphical Target. +- If nvidia is set, it will load the NVIDIA modules before starting the Graphical Target. Moreover, if an intel config is set but the Intel card was disabled in BIOS (leaving only the dGPU), this service will automatically switch to the nvidia config. The reverse is also true (nvidia config set but BIOS configured to use iGPU only). +- If intel is set, it will load bbswitch module to set nvidia OFF. ## FAQ @@ -97,9 +100,12 @@ Where `<driver>` is one of: -- `intel`: use the `modesetting` driver (PRIME Render Offload possible with >= 435.xx driver) -- `intel2`: use the `intel` driver (xf86-video-intel) (PRIME Render Offload possible with >= 435.xx driver) +- `intel`: use the `modesetting` driver +- `intel2`: use the `intel` driver (xf86-video-intel) - `nvidia`: use the NVIDIA proprietary driver +- `offload`: use PRIME Render Offload (possible with >= 435.xx driver) + +Full command list available at `sudo prime-select` ### How do I check the current driver configured and the power state of the NVIDIA card (390.xxx legacy driver)? @@ -126,3 +132,13 @@ In case you disabled HDMI audio support manually (i.e. probably not using a SUSE package) by following the section "NVIDIA power off support since 435.xxx driver with Turing GPU and later (G05 driver packages)" above you need to revert this step, i.e. remove again the file `/etc/udev/rules.d/90-nvidia-udev-pm-G05.rules`. +### Custom BOOT entries + +When service is enabled, the script is capable to recognize following kernel parameters: + +``` +nvidia.prime=offload | nvidia.prime=intel | nvidia.prime=intel2 | nvidia.prime=nvidia +``` + +So is possible to have custom bootloader entries with all modes. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.17/prime-select.sh new/SUSEPrime-0.8.2/prime-select.sh --- old/SUSEPrime-0.7.17/prime-select.sh 2021-03-08 16:55:43.000000000 +0100 +++ new/SUSEPrime-0.8.2/prime-select.sh 2021-09-07 10:17:29.000000000 +0200 @@ -13,11 +13,13 @@ xorg_nvidia_conf="/usr/share/prime/xorg-nvidia.conf" xorg_intel_conf_intel="/usr/share/prime/xorg-intel.conf" xorg_intel_conf_intel2="/usr/share/prime/xorg-intel-intel.conf" +xorg_amd_conf="/usr/share/prime/xorg-amd.conf" xorg_nvidia_prime_render_offload="/usr/share/prime/xorg-nvidia-prime-render-offload.conf" prime_logfile="/var/log/prime-select.log" nvidia_modules="ipmi_devintf nvidia_drm nvidia_modeset nvidia_uvm nvidia ipmi_msghandler" -driver_choices="nvidia|intel|intel2" +driver_choices="nvidia|intel|intel2|amd|offload" lspci_intel_line="VGA compatible controller: Intel" +lspci_amd_line="VGA compatible controller: Advanced Micro Devices" lspci_nvidia_vga_line="VGA compatible controller: NVIDIA" lspci_nvidia_3d_line="3D controller: NVIDIA" @@ -31,16 +33,17 @@ panel_nvidia=eDP-1-1 panel_intel=eDP-1 panel_intel2=eDP1 + panel_amd=eDP-1 fi # Check if prime-select service is enabled. Some users may want to use nvidia prime offloading sometimes so they can disable service temporarily. # SusePRIME bbswitch will work as non-bbswitch one [ -f /etc/systemd/system/multi-user.target.wants/prime-select.service ] -service_test=$? +service_test=$? # Check if prime-select systemd service is present (in that case service_test value is 0) # If it is present (suse-prime-bbswitch package), the script assumes that bbswitch is to be used -# otherwise (suse-prime package) it works without bbswitch +# otherwise (suse-prime package) it works without bbswitch [ -f /usr/lib/systemd/system/prime-select.service ] service_test_installed=$? @@ -51,46 +54,40 @@ echo echo "NVIDIA/Intel video card selection for NVIDIA Optimus laptops." echo - + if (( service_test == 0 )); then - echo "usage: $(basename $0) $driver_choices|unset|get-current|get-boot|log-view|log-clean" - echo "usage: $(basename $0) boot $driver_choices|last" - echo "usage: $(basename $0) next-boot $driver_choices|abort" - echo "usage: $(basename $0) service check|disable|restore" + echo "usage: $(basename $0) $driver_choices|unset|get-current|get-boot|offload-set|log-view|log-clean" + echo "usage: $(basename $0) boot $driver_choices|last" + echo "usage: $(basename $0) next-boot $driver_choices|abort" + echo "usage: $(basename $0) service check|disable|restore" else - echo "usage: $(basename $0) $driver_choices|unset|get-current|log-view|log-clean" + echo "usage: $(basename $0) $driver_choices|unset|get-current|offload-set|log-view|log-clean" fi - + echo echo "nvidia: use the NVIDIA proprietary driver" echo "intel: use the Intel card with the \"modesetting\" driver" - echo " PRIME Render Offload possible with >= 435.xx NVIDIA driver with prime-select service DISABLED" echo "intel2: use the Intel card with the \"intel\" Open Source driver (xf86-video-intel)" - echo " PRIME Render Offload possible with >= 435.xx NVIDIA driver with prime-select service DISABLED" + echo "amd: use the Amd card with the \"amd\" Open Source driver (xf86-video-amdgpu)" + echo "offload PRIME Render Offload possible with >= 435.xx NVIDIA driver" + echo "offload-set choose which intel driver use in PRIME Render Offload" echo "unset: disable effects of this script and let Xorg decide what driver to use" echo "get-current: display driver currently configured" echo "log-view: view logfile" echo "log-clean: clean logfile" - + if (( service_test_installed == 0 )); then - echo "boot: select default card at boot or set last used" - echo "next-boot: select card ONLY for next boot, it not touches your boot preference. abort: restores next boot to default" - echo "get-boot: display default card at boot" - echo "service: disable, check or restore prime-select service." - fi - - #if (( service_test == 0)); then - # echo - # echo "##FOLLOWING COMMANDS ARE USED BY prime-select SERVICEs, DON'T USE THEM MANUALLY##" - # echo "systemd_call: called during boot or after user logout for switch" - # echo "user_logout_waiter: waits user logout (used by prime-select systemd service)" - #fi - + echo "boot: select default card at boot or set last used" + echo " supports kernel parameter nvidia.prime=intel|intel2|nvidia|amd|offload" + echo "next-boot: select card ONLY for next boot, it not touches your boot preference. abort: restores next boot to default" + echo "get-boot: display default card at boot" + echo "service: disable, check or restore prime-select service." + fi echo } function logging { - if ! [ -f $prime_logfile ]; then + if ! [ -f $prime_logfile ]; then echo "##SUSEPrime logfile##" > $prime_logfile fi echo "[ $(date +"%H:%M:%S") ] ${1}" >> $prime_logfile @@ -107,36 +104,88 @@ function check_service { if (( service_test != 0)); then if (( service_test_installed != 0)); then - echo "SUSE Prime service not installed. bbswitch can't switch off nvidia card" + #echo "SUSE Prime service not installed. bbswitch can't switch off nvidia card" echo "Commands: boot | next-boot | get-boot | service aren't available" exit 1; else - echo "SUSE Prime service is DISABLED. bbswitch can't switch off nvidia card" + #echo "SUSE Prime service is DISABLED. bbswitch can't switch off nvidia card" echo "Commands: boot | next-boot | get-boot aren't available" echo "You can re-enable it using "prime-select service restore"" exit 1; fi - fi + fi +} + +function nv_offload_capable { + #checks if nvidia driver version is offload capable (>=435.00) + (( $(modinfo nvidia | grep ^version: | awk '{print $2}' | tr -d .) >= 43500 )) +} + +function offload_pref_check { + #checks if there's a preference for nvidia-offloading + if ! [ -f /etc/prime/offload_type ]; then + echo "intel" > /etc/prime/offload_type + logging "Using default intel modesetting driver for offloading." + fi } function bbcheck { - if rpm -q bbswitch > /dev/null; then - if grep OFF /proc/acpi/bbswitch > /dev/null; then - echo "[bbswitch] NVIDIA card is OFF" - elif grep ON /proc/acpi/bbswitch > /dev/null; then - echo "[bbswitch] NVIDIA card is ON" + #searching module is better than rpm package because there are other bbswitch providers like dkms-bbswitch + if ! [ $(modinfo bbswitch 2> /dev/null | wc -c) = 0 ]; then + if ! [ "$(lsmod | grep bbswitch)" > /dev/null ]; then + if [ "$(lsmod | grep nvidia_drm)" > /dev/null ]; then + echo "bbswitch not loaded. NVIDIA modules are loaded" + else + echo "bbswitch not loaded. NVIDIA modules are NOT loaded" + echo "if you want energy saving bbswitch should be loaded in intel mode" + fi + else + if grep OFF /proc/acpi/bbswitch > /dev/null; then + echo "[bbswitch] NVIDIA card is OFF" + elif grep ON /proc/acpi/bbswitch > /dev/null; then + #never happens 'cause bbswitch should not be loaded in nvidia/offload mode + echo "[bbswitch] NVIDIA card is ON" + else + #never happens? + echo "bbswitch is running but seems broken. Cannot get NVIDIA power status" + fi + fi + else + #should never happen with suse-prime-bbswitch package as bbswitch is a dependency + echo "bbswitch module not found. NVIDIA card will not be powered off" + fi +} + +function nvpwr { + #parameter set to 1 (unload bbswitch and keep nvidia ON) + #parameter set to 0 (load bbswitch with load_state=0 and unload_state=1) + if [ "${1}" = "1" ]; then + if lsmod | grep bbswitch > /dev/null; then + if [ $(cat /sys/module/bbswitch/parameters/unload_state) == 1 ]; then + logging "Unloading bbswitch and switching nvidia ON..." + modprobe -r bbswitch + else + #should never happens + tee /proc/acpi/bbswitch <<<ON + logging "trying switch ON nvidia: $(bbcheck)" + fi + fi + else + if ! lsmod | grep bbswitch > /dev/null; then + modprobe bbswitch load_state=0 unload_state=1 else - echo "bbswitch is installed but seems broken. Cannot get NVIDIA power status" + #should never happens + tee /proc/acpi/bbswitch <<<OFF fi - elif (( service_test == 0)); then - # should never happen with suse-prime-bbswitch package as bbswitch is a dependency - echo "bbswitch is not installed. NVIDIA card will not be powered off" + logging "NVIDIA card will be switched off, NVIDIA offloading will not be available" + logging "trying switch OFF nvidia: $(bbcheck)" fi } function clean_xorg_conf_d { rm -f /etc/X11/xorg.conf.d/90-nvidia.conf rm -f /etc/X11/xorg.conf.d/90-intel.conf + rm -f /etc/X11/xorg.conf.d/90-amd.conf } function update_kdeglobals { @@ -150,25 +199,25 @@ # # QT_SCREEN_SCALE_FACTORS=eDP-1-1=2;DP-0=2;DP-1=2;HDMI-0=2;DP-2=2;DP-3=2;DP-4=2; # - # The value of this variable is crucial to have KDE scale the QT widgets properly + # The value of this variable is crucial to have KDE scale the QT widgets properly # # The problem is that the laptop panel output name (eDP-1-1 in that example, always listed first) is not the same depending # on whether the intel (modesetting), intel2 (intel) or nvidia driver is used, resulting in that variable # not being up-to-date when user switches drivers with this script and scaling not working properly # - # code below is a workaround that edits file ~/.config/kdeglobals with the proper panel name + # code below is a workaround that edits file ~/.config/kdeglobals with the proper panel name # passed as first parameter of this function [ -z "$user" ] && return - + panel_name=${1} - + kdeglobals="$(sudo -u $user -i eval 'echo -n $HOME')/.config/kdeglobals" - + if [ -f $kdeglobals ]; then - sudo -u $user sed -i -r "s/(ScreenScaleFactors=)$panel_nvidia|$panel_intel|$panel_intel2/\1$panel_name/" "$kdeglobals" - logging "updated $kdeglobals" - fi + sudo -u $user sed -i -r "s/(ScreenScaleFactors=)$panel_nvidia|$panel_intel|$panel_intel2/\1$panel_name/" "$kdeglobals" + logging "updated $kdeglobals" + fi } function restore_old_state { @@ -200,24 +249,22 @@ function set_nvidia { - if (( service_test == 0)); then - - if [ -f /proc/acpi/bbswitch ]; then - tee /proc/acpi/bbswitch > /dev/null <<EOF -ON -EOF - fi - - logging "trying switch ON nvidia: $(bbcheck)" + nvpwr 1 + if ! lsmod | grep nvidia > /dev/null; then + # will also load all necessary dependent modules + #waits nvidia modules properly loaded + #protect until cycle from infinite loop currtime=$(date +"%T"); - # will also load all necessary dependent modules - modprobe nvidia_drm - - #waits nvidia modules properly loaded - until [ "$(journalctl --since "$currtime" | grep -E "[nvidia-drm]".*"Loading driver")" > /dev/null ]; do echo; done + modprobe nvidia_drm + SECONDS=0 + until [ "$(journalctl --since "$currtime" | grep -E "[nvidia-drm]".*"Loading driver")" > /dev/null ]; do + if (($SECONDS > 7)); then + logging "ERROR: cannot load nvidia modules [timed out]" + break + fi + done + fi - fi - gpu_info=$(nvidia-xconfig --query-gpu-info) # This may easily fail, if no NVIDIA kernel module is available or alike if [ $? -ne 0 ]; then @@ -225,7 +272,7 @@ restore_old_state exit 1 fi - + # There could be more than on NVIDIA card/GPU; use the first one in that case nvidia_busid=$(echo "$gpu_info" | grep -i "PCI BusID" | head -n 1 | sed 's/PCI BusID ://' | sed 's/ //g') @@ -235,12 +282,12 @@ update-alternatives --set libglx.so $libglx_nvidia > /dev/null fi - clean_xorg_conf_d + clean_xorg_conf_d cat $xorg_nvidia_conf | sed 's/PCI:X:X:X/'${nvidia_busid}'/' > /etc/X11/xorg.conf.d/90-nvidia.conf update_kdeglobals $panel_nvidia - + echo "nvidia" > /etc/prime/current_type logging "NVIDIA card correctly set" } @@ -248,107 +295,139 @@ function set_intel { # modesetting driver is part of xorg-x11-server and always available conf=$xorg_intel_conf_intel - echo "intel" > /etc/prime/current_type + if ! [ "$(cat /etc/prime/current_type)" = "offload" ]; then + echo "intel" > /etc/prime/current_type + fi #jump to common function intel1/intel2 - common_set_intel + common_set "${lspci_intel_line}" 'Intel' update_kdeglobals $panel_intel } function set_intel2 { conf=$xorg_intel_conf_intel2 - echo "intel2" > /etc/prime/current_type + if ! [ "$(cat /etc/prime/current_type)" = "offload" ]; then + echo "intel2" > /etc/prime/current_type + fi #jump to common function intel1/intel2 - common_set_intel + common_set "${lspci_intel_line}" 'Intel' update_kdeglobals $panel_intel2 } -function common_set_intel { +function set_amd { + conf=$xorg_amd_conf + if ! [ "$(cat /etc/prime/current_type)" = "offload" ]; then + echo "amd" > /etc/prime/current_type + fi + common_set "${lspci_amd_line}" 'Amd' + update_kdeglobals $panel_amd + +} + + +function common_set { # find Intel card bus id. Without this Xorg may fail to start - line=$(lspci | grep "$lspci_intel_line" | head -1) + lspci_line=$1 + constructor=$2 + lowercase_constructor=$(echo $constructor | tr '[A-Z]' '[a-z]') + line=$(lspci | grep "$lspci_line" | head -1) if [ $? -ne 0 ]; then - logging "Failed to find Intel card with lspci" + logging "Failed to find $constructor card with lspci" exit 1 fi - intel_busid=$(echo $line | cut -f 1 -d ' ' | sed -e 's/\./:/g;s/:/ /g' | awk -Wposix '{printf("PCI:%d:%d:%d\n","0x" $1, "0x" $2, "0x" $3 )}') + card_busid=$(echo $line | cut -f 1 -d ' ' | sed -e 's/\./:/g;s/:/ /g' | awk -Wposix '{printf("PCI:%d:%d:%d\n","0x" $1, "0x" $2, "0x" $3 )}') if [ $? -ne 0 ]; then - logging "Failed to build Intel card bus id" + logging "Failed to build $constructor card bus id" exit 1 fi - + clean_xorg_conf_d - - cat $conf | sed -e 's/PCI:X:X:X/'${intel_busid}'/' > /etc/X11/xorg.conf.d/90-intel.conf - - if (( service_test == 0)); then - # try only n times; avoid endless loop which may block system updates forever (boo#1173632) - last=3 - for try in $(seq 1 $last); do - modprobe -r $nvidia_modules && break - if [ $try -eq $last ]; then - echo "NVIDIA kernel modules cannot be unloaded (tried $last times). Your machine may need a reboot." - fi - done + cat $conf | sed -e 's/PCI:X:X:X/'${card_busid}'/' > /etc/X11/xorg.conf.d/90-${lowercase_constructor}.conf - if [ -f /proc/acpi/bbswitch ]; then - tee /proc/acpi/bbswitch > /dev/null <<EOF -OFF -EOF - logging "NVIDIA card will be switched off, NVIDIA offloading will not be available" - fi - - logging "trying switch OFF nvidia: $(bbcheck)" - - else + if [ "$(cat /etc/prime/current_type)" = "offload" ]; then + nvpwr 1 + if ! lsmod | grep nvidia > /dev/null; then + logging "Loading nvidia_modules" + modprobe nvidia_modeset + fi # extra snippet nvidia for NVIDIA's Prime Render Offload mode gpu_info=$(nvidia-xconfig --query-gpu-info 2> /dev/null) - # This may easily fail, if no NVIDIA kernel module is available or alike + # This may easily fail, if no NVIDIA kernel module is available or alike if [ $? -eq 0 -a "$gpu_info" != "" ]; then # There could be more than on NVIDIA card/GPU; use the first one in that case nvidia_busid=$(echo "$gpu_info" | grep -i "PCI BusID" | head -n 1 | sed 's/PCI BusID ://' | sed 's/ //g') logging "Adding support for NVIDIA Prime Render Offload" - cat $xorg_nvidia_prime_render_offload | sed -e 's/PCI:Y:Y:Y/'${nvidia_busid}'/' >> /etc/X11/xorg.conf.d/90-intel.conf + cat $xorg_nvidia_prime_render_offload | sed -e 's/PCI:Y:Y:Y/'${nvidia_busid}'/' >> /etc/X11/xorg.conf.d/90-${lowercase_constructor}.conf else logging "PCI BusID of NVIDIA card could not be detected!" logging "NVIDIA Prime Render Offload not supported!" fi + else + # try only n times; avoid endless loop which may block system updates forever (boo#1173632) + last=3 + for try in $(seq 1 $last); do + modprobe -r $nvidia_modules && break + if [ $try -eq $last ]; then + echo "NVIDIA kernel modules cannot be unloaded (tried $last times). Your machine may need a reboot." + fi + done + nvpwr 0 fi - + libglx_xorg=$(update-alternatives --list libglx.so | grep xorg-libglx.so) - update-alternatives --set libglx.so $libglx_xorg > /dev/null - - logging "Intel card correctly set" + update-alternatives --set libglx.so $libglx_xorg > /dev/null + + logging "$constructor card correctly set" } + function apply_current { if [ -f /etc/prime/current_type ]; then - + current_type=$(cat /etc/prime/current_type) - - if [ "$current_type" != "nvidia" ] && ! lspci | grep "$lspci_intel_line" > /dev/null; then - + + if [ "$current_type" == "intel" ] || [ "$current_type" == "intel2" ] + then + + if ! lspci | grep "$lspci_intel_line" > /dev/null; then + # this can happen if user set intel but changed to "Discrete only" in BIOS # in that case the Intel card is not visible to the system and we must switch to nvidia - + logging "Forcing nvidia due to Intel card not found" current_type="nvidia" + fi + + elif [ "$current_type" == "amd" ] && ! lspci | grep "$lspci_amd_line" > /dev/null; then + + # this can happen if user set intel but changed to "Discrete only" in BIOS + # in that case the Intel card is not visible to the system and we must switch to nvidia + + logging "Forcing nvidia due to Amd card not found" + current_type="nvidia" elif [ "$current_type" = "nvidia" ] && \ ! lspci | grep -q "$lspci_nvidia_vga_line" && \ ! lspci | grep -q "$lspci_nvidia_3d_line"; then - + # this can happen if user set nvidia but changed to "Integrated only" in BIOS (possible # on some MUXED Optimus laptops) in that case the NVIDIA card is not visible to the # system and we must switch to intel - + logging "Forcing intel due to NVIDIA card not found" current_type="intel" fi - - - set_$current_type + + + + if [ "$current_type" = "offload" ]; then + offload_pref_check + set_$(cat /etc/prime/offload_type) + else + set_$current_type + fi fi } @@ -361,47 +440,29 @@ if ! [ -f /etc/prime/current_type ]; then echo "Preparing first configuration" elif [ "$type" = "$(cat /etc/prime/current_type)" ]; then - echo "$type driver already in use!" - exit 1 - fi -} - -function booting { - if ! [ -f /etc/prime/boot_state ]; then - echo "N" > /etc/prime/boot_state - fi - if ! [ -f /etc/prime/boot ]; then - echo "last" > /etc/prime/boot - fi - - if [ -f /etc/prime/forced_boot ]; then - echo "$(cat /etc/prime/forced_boot)" > /etc/prime/current_type - rm /etc/prime/forced_boot - logging "Boot: forcing booting with $(cat /etc/prime/current_type), boot preference ignored" - logging "Boot: setting-up $(cat /etc/prime/current_type) card" - apply_current - else - boot_type=$(cat /etc/prime/boot) - if [ "$boot_type" != "last" ]; then - echo "$boot_type" > /etc/prime/current_type + if [ "$type" = "offload" ]; then + if [[ "$(cat /etc/prime/offload_type)" = "intel" && "$(cat /etc/X11/xorg.conf.d/90-intel.conf | grep "Driver \"modesetting\"")" > /dev/null ]] || + [[ "$(cat /etc/prime/offload_type)" = "intel2" && "$(cat /etc/X11/xorg.conf.d/90-intel.conf | grep "Driver \"intel\"")" > /dev/null ]]; then + echo "NVIDIA offloading with $(cat /etc/prime/offload_type) already in use!" + exit 1 + fi + else + echo "$type driver already in use!" + exit 1 fi - logging "Boot: setting-up $(cat /etc/prime/current_type) card" - apply_current fi } function logout_switch { apply_current - echo "N" > /etc/prime/boot_state - logging "HotSwitch: starting Display Manager [ boot_state > N ]" - systemctl start display-manager & - systemctl stop prime-select + logging "HotSwitch: starting Display Manager" + systemctl start display-manager + logging "HotSwitch: completed!" } function logout_switch_no_dm { apply_current - echo "N" > /etc/prime/boot_state - systemctl stop prime-select + logging "HotSwitch: completed!" } function set_user { @@ -409,154 +470,209 @@ } case $type in - - nvidia|intel|intel2) - + + nvidia|intel|intel2|offload|amd) + echo $type catched current_check check_root - + + if [ $type = "offload" ]; then + if ! nv_offload_capable; then + echo "ERROR: offloading needs nvidia drivers >= 435.xx" + exit 1 + fi + fi + if ! [ -f /var/log/prime-select.log ]; then echo "##SUSEPrime logfile##" > $prime_logfile fi - if [ $(wc -l < $prime_logfile) -gt 1000 ]; then + if [ $(wc -l < $prime_logfile) -gt 1000 ]; then #cleaning logfile if has more than 1k events rm $prime_logfile &> /dev/null echo "##SUSEPrime logfile##" > $prime_logfile fi - if [ "$type" = "intel2" ];then + if [ "$type" = "intel2" ];then if ! rpm -q xf86-video-intel > /dev/null; then echo "package xf86-video-intel is not installed"; exit 1 fi fi - - if (( service_test == 0)); then - - if ! { [ "$(bbcheck)" = "[bbswitch] NVIDIA card is ON" ] || [ "$(bbcheck)" = "[bbswitch] NVIDIA card is OFF" ]; }; then - bbcheck - fi - - #DM_check - - # might be empty if script not invoked by sudo, ie directly by root - user=$SUDO_USER - - if systemctl is-active graphical.target > /dev/null; then + + if [ "$type" = "amd" ];then + if ! rpm -q xf86-video-amdgpu > /dev/null; then + echo "package xf86-video-amdgpu is not installed"; + exit 1 + fi + fi + + if ! { [ "$(bbcheck)" = "[bbswitch] NVIDIA card is ON" ] || [ "$(bbcheck)" = "[bbswitch] NVIDIA card is OFF" ]; }; then + bbcheck + fi + + # might be empty if script not invoked by sudo, ie directly by root + user=$SUDO_USER + #DM_check + if systemctl is-active graphical.target > /dev/null; then #GDM_mode if [ "$(systemctl status display-manager | grep gdm)" > /dev/null ]; then $0 user_logout_waiter $type gdm $user & logging "user_logout_waiter: started" - #SDDM_mode + #SDDM_mode elif [ "$(systemctl status display-manager | grep sddm)" > /dev/null ]; then $0 user_logout_waiter $type sddm $user & logging "user_logout_waiter: started" - #lightdm_mode + #lightdm_mode elif [ "$(systemctl status display-manager | grep lightdm)" > /dev/null ]; then $0 user_logout_waiter $type lightdm $user & logging "user_logout_waiter: started" - #XDM_mode + #XDM_mode elif [ "$(systemctl status display-manager | grep xdm)" > /dev/null ]; then $0 user_logout_waiter $type xdm $user & logging "user_logout_waiter: started" - #KDM_mode(uses xdm->calls xdm_mode) + #KDM_mode(uses xdm->calls xdm_mode) elif [ "$(systemctl status display-manager | grep kdm)" > /dev/null ]; then $0 user_logout_waiter $type xdm $user & logging "user_logout_waiter: started" - #unsupported_dm_force_close_option + #unsupported_dm_force_close_option else echo "Unsupported display-manager, please report this to project page to add support." echo "Script works even in init 3" echo "You can force-close session and switch graphics [could be dangerous]," - read -p "ALL UNSAVED DATA IN SESSION WILL BE LOST, CONTINUE? [Y/N]: " choice + read -p "ALL UNSAVED DATA IN SESSION WILL BE LOST, CONTINUE? [Y/N]: " choice case "$choice" in - y|Y ) - killall xinit + y|Y ) + killall xinit $0 user_logout_waiter $type now $user ;; * ) echo "Aborted. Exit."; exit ;; esac - fi + fi + #manually_started_X_case elif [ "$(systemctl is-active multi-user.target)" > /dev/null ] && [ "$(pgrep -x xinit)" > /dev/null ]; then $0 user_logout_waiter $type x_only $user & logging "user_logout_waiter: started" - # from console without Xorg running + # from console without Xorg running else save_old_state echo $type > /etc/prime/current_type apply_current remove_old_state - exit - fi + exit + fi + echo -e "Logout to switch graphics" + ;; + + offload-set) - else # no service used + if [ "$2" = "intel2" ]; then + if ! rpm -q xf86-video-intel > /dev/null; then + echo "package xf86-video-intel is not installed"; + exit 1 + fi + fi - save_old_state - echo $type > /etc/prime/current_type - apply_current - remove_old_state + if [ "$2" = "amd" ];then + if ! rpm -q xf86-video-amdgpu > /dev/null; then + echo "package xf86-video-amdgpu is not installed"; + exit 1 + fi + fi + if ! nv_offload_capable; then + echo "ERROR: offloading needs nvidia drivers >= 435.xx" + exit 1 fi - - echo -e "Logout to switch graphics" - ;; - + case $2 in + intel|intel2) + echo $2 > /etc/prime/offload_type + echo "nvidia-offload is now available with $2 driver" + echo "use it with \"prime-select offload\"" + ;; + *) + echo "Only intel|intel2 driver is available in nvidia-offload!" + ;; + esac + ;; + boot) - check_service + check_service check_root - - case $2 in - - nvidia|intel|intel2|last) - - if [ "$2" = "intel2" ]; then + + case $2 in + + nvidia|intel|intel2|amd|last|offload) + + if [ "$2" = "intel2" ]; then if ! rpm -q xf86-video-intel > /dev/null; then echo "package xf86-video-intel is not installed"; exit 1 fi fi - - echo "$2" > /etc/prime/boot - set_user $SUDO_USER - + + if [ "$2" = "amd" ];then + if ! rpm -q xf86-video-amdgpu > /dev/null; then + echo "package xf86-video-amdgpu is not installed"; + exit 1 + fi + fi + + if [ $2 = "offload" ]; then + if ! nv_offload_capable; then + echo "ERROR: offloading needs nvidia drivers >= 435.xx" + exit 1 + fi + fi + echo "$2" > /etc/prime/boot + set_user $SUDO_USER $0 get-boot - ;; - - *) - + ;; + + *) echo "Invalid choice" usage - ;; + ;; esac - ;; - + ;; + next-boot) - check_service + check_service check_root - + case $2 in - - nvidia|intel|intel2) - - if [ "$2" = "intel2" ]; then + + nvidia|intel|intel2|amd|offload) + + if [ "$2" = "intel2" ]; then if ! rpm -q xf86-video-intel > /dev/null; then echo "package xf86-video-intel is not installed"; exit 1 fi fi - + + if [ "$2" = "amd" ];then + if ! rpm -q xf86-video-amdgpu > /dev/null; then + echo "package xf86-video-amdgpu is not installed"; + exit 1 + fi + fi + if [ $2 = "offload" ]; then + if ! nv_offload_capable; then + echo "ERROR: offloading needs nvidia drivers >= 435.xx" + exit 1 + fi + fi echo "$2" > /etc/prime/forced_boot - set_user $SUDO_USER - - $0 get-boot - ;; - - abort) - + set_user $SUDO_USER + $0 get-boot + ;; + + abort) + if [ -f /etc/prime/forced_boot ]; then rm /etc/prime/forced_boot echo "Next boot forcing aborted" @@ -564,226 +680,235 @@ echo "Next boot is NOT forced" exit 1 fi - ;; + ;; *) - echo "Invalid choice" usage - ;; + ;; esac - ;; - - + ;; + + get-current) - - if [ -f /etc/prime/current_type ]; then + + if [ -f /etc/prime/current_type ]; then echo -n "Driver configured: " cat /etc/prime/current_type - else + else echo "No driver configured." usage - fi - + fi bbcheck - ;; + ;; unset) - check_root - if (( service_test == 0 )); then - $0 service disable - fi - clean_xorg_conf_d - libglx_xorg=$(update-alternatives --list libglx.so | grep xorg-libglx.so) - update-alternatives --set libglx.so $libglx_xorg > /dev/null - rm /etc/prime/current_type &> /dev/null - rm /etc/prime/boot_state &> /dev/null - rm /etc/prime/boot &> /dev/null - rm /etc/prime/forced_boot &> /dev/null - rm /etc/prime/user &> /dev/null - rm $prime_logfile &> /dev/null - ;; - + check_root + if (( service_test == 0 )); then + $0 service disable + fi + clean_xorg_conf_d + libglx_xorg=$(update-alternatives --list libglx.so | grep xorg-libglx.so) + update-alternatives --set libglx.so $libglx_xorg > /dev/null + rm /etc/prime/current_type &> /dev/null + rm /etc/prime/offload_type &> /dev/null + rm /etc/prime/boot &> /dev/null + rm /etc/prime/forced_boot &> /dev/null + rm /etc/prime/user &> /dev/null + rm $prime_logfile &> /dev/null + ;; + service) - if (( service_test_installed != 0)); then - echo "SUSE Prime service not installed. bbswitch can't switch off nvidia card" - echo "Commands: boot | next-boot | get-boot | service aren't available" - exit 1; - fi - + if (( service_test_installed != 0)); then + #echo "SUSE Prime service not installed. bbswitch can't switch off nvidia card" + echo "Commands: boot | next-boot | get-boot | service aren't available" + exit 1; + fi + case $2 in - - check) - + + check) + if (( service_test == 0 )); then - echo "prime-select: service is set correctly" - exit + echo "prime-select: service is set correctly" + exit fi echo "prime-select: service has a wrong setting or is disabled by user, please do prime-select service restore" echo "If you are running this command in multi-user.target please ignore this message" - ;; - - restore) - + ;; + + restore) + check_root systemctl enable prime-select echo "prime-select: service restored" logging "service restored by user" - ;; - - disable) - + ;; + + disable) + check_root systemctl disable prime-select echo -e "prime-select: service disabled. Remember prime-select needs this service to work correctly.\nUse prime-select service restore to enable service again " logging "service disabled by user" - ;; - - *) - + ;; + + *) echo "Invalid choice" usage - ;; + ;; esac - - - ;; + ;; user_logout_waiter) - echo "S" > /etc/prime/boot_state + currtime=$(date +"%T"); + dm_func=logout_switch + #manage journalctl to check when X restarted, then jump init 3 + case "$3" in - # only wait for session logout when displayamanger is still running (boo#1182667) - if [ "$(systemctl status display-manager | grep "Stopped X Display Manager")" > /dev/null ]; then - # S2 = special switch state to indicate that we must not switch to graphical.target (in systemd_call) since displayamanger is currently not running - echo "S2" > /etc/prime/boot_state - else - currtime=$(date +"%T"); - #manage journalctl to check when X restarted, then jump init 3 - case "$3" in - gdm ) - #GDM_mode - until [ "$(journalctl --since "$currtime" | grep -e "pam_unix(gdm-password:session): session closed" \ - -e "pam_unix(gdm-autologin:session): session closed")" > /dev/null ]; do + #GDM_mode + until [ "$(journalctl --since "$currtime" | grep -e "pam_unix(gdm-password:session): session closed" \ + -e "pam_unix(gdm-autologin:session): session closed")" > /dev/null ]; do sleep 0.5s - done - logging "user_logout_waiter: X restart detected, preparing switch to $2 [ boot_state > S ]" - ;; - - #SDDM_mode + done + logging "user_logout_waiter: X restart detected, preparing switch to $2" + ;; + sddm ) - until [ "$(journalctl --since "$currtime" -e _COMM=sddm | grep "Removing display")" > /dev/null ]; do + #SDDM_mode + until [ "$(journalctl --since "$currtime" -e _COMM=sddm | grep "Removing display")" > /dev/null ]; do sleep 0.5s - done - logging "user_logout_waiter: X restart detected, preparing switch to $2 [ boot_state > S ]" - ;; - - #lightdm_mode + done + logging "user_logout_waiter: X restart detected, preparing switch to $2" + ;; + lightdm ) - until [ "$(journalctl --since "$currtime" -e | grep "pam_unix(lightdm:session): session closed")" > /dev/null ]; do + #lightdm_mode + until [ "$(journalctl --since "$currtime" -e | grep "pam_unix(lightdm:session): session closed")" > /dev/null ]; do sleep 0.5s - done - logging "user_logout_waiter: X restart detected, preparing switch to $2 [ boot_state > S ]" - ;; - - #xdm/kdm_mode + done + logging "user_logout_waiter: X restart detected, preparing switch to $2" + ;; + xdm ) - until [ "$(journalctl --since "$currtime" -e | grep "pam_unix(xdm:session): session closed for user")" > /dev/null ]; do + #xdm/kdm_mode + until [ "$(journalctl --since "$currtime" -e | grep "pam_unix(xdm:session): session closed for user")" > /dev/null ]; do sleep 0.5s - done - logging "user_logout_waiter: X restart detected, preparing switch to $2 [ boot_state > S ]" - #stopping display-manager before runlev.3 seems work faster - #systemctl stop display-manager - - ;; - - #manually_started_X_case + done + logging "user_logout_waiter: X restart detected, preparing switch to $2" + ;; + x_only ) - while [ "$(pgrep -x xinit)" > /dev/null ]; do + #manually_started_X_case + while [ "$(pgrep -x xinit)" > /dev/null ]; do sleep 0.5s - done - logging "user_logout_waiter: X stop detected, preparing switch to $2 [ boot_state > S2 ]" - - # S2 = special switch state to indicate that we must not switch to graphical.target (in systemd_call) since we are using xinit/startx - echo "S2" > /etc/prime/boot_state - ;; - - esac - fi + done + logging "user_logout_waiter: X stop detected, preparing switch to $2" + dm_func=logout_switch_no_dm + ;; + esac echo $2 > /etc/prime/current_type - set_user $4 - + set_user $4 systemctl stop display-manager - systemctl start prime-select & - ;; - + #calling logout_switch or logout_switch_no_dm based on dm_func variable + $dm_func + ;; + systemd_call) - # user is used in update_kdeglobals - # it is the last user that invoked this script via sudo - [ -f /etc/prime/user ] && user=$(cat /etc/prime/user) - - #checks if system is booting or switching only - if [ "$(journalctl -b 0 | grep suse-prime)" > /dev/null ]; then + # user is used in update_kdeglobals + # it is the last user that invoked this script via sudo + [ -f /etc/prime/user ] && user=$(cat /etc/prime/user) - boot_state=$(cat /etc/prime/boot_state) - - case $boot_state in - - S) - logout_switch - ;; - S2) - logout_switch_no_dm - ;; - esac - - else - booting + #checks if system is booting or switching only + #boot priority is forced boot > kernel parameter > boot preference + if ! journalctl -b 0 | grep suse-prime > /dev/null; then + if [ -f /etc/prime/forced_boot ]; then + echo "$(cat /etc/prime/forced_boot)" > /etc/prime/current_type + rm /etc/prime/forced_boot + logging "Boot: forcing booting with $(cat /etc/prime/current_type), boot preference ignored" + else + #search kernel "nvidia.prime=intel|intel2|nvidia|amd|offload" parameter + kparam=$(grep -oP 'nvidia.prime=\K\S+' /proc/cmdline) + if [ "$kparam" > /dev/null ]; then + case "$kparam" in + intel|nvidia) + logging "Boot: nvidia.prime="$kparam" kernel parameter detected!" + echo "$kparam" > /etc/prime/current_type + ;; + intel2) + if ! rpm -q xf86-video-intel > /dev/null; then + logging "Boot: package xf86-video-intel is not installed, ignoring"; + else + logging "Boot: nvidia.prime="$kparam" kernel parameter detected!" + echo "$kparam" > /etc/prime/current_type + fi + ;; + offload) + if ! nv_offload_capable; then + logging "Boot: offloading needs nvidia drivers >= 435.xx, ignoring kernel parameter" + else + echo "$kparam" > /etc/prime/current_type + logging "Boot: nvidia.prime="$kparam" kernel parameter detected!" + fi + ;; + esac + else + if ! [ -f /etc/prime/boot ]; then + echo "last" > /etc/prime/boot + fi + boot_type=$(cat /etc/prime/boot) + if [ "$boot_type" != "last" ]; then + echo "$boot_type" > /etc/prime/current_type + fi + fi + logging "Boot: setting-up $(cat /etc/prime/current_type) card" + fi + logout_switch_no_dm fi - ;; - + ;; + get-boot) - check_service - + check_service if [ -f /etc/prime/boot ]; then - echo "Default at system boot: $(cat /etc/prime/boot)" + echo "Default at system boot: $(cat /etc/prime/boot)" else - echo "Default at system boot: auto (last)" - echo "You can configure it with prime-select boot intel|intel2|nvidia|last" + echo "Default at system boot: auto (last)" + echo "You can configure it with prime-select boot intel|intel2|nvidia|amd|last" fi if [ -f /etc/prime/forced_boot ]; then - echo "Next boot forced to $(cat /etc/prime/forced_boot) by user" + echo "Next boot forced to $(cat /etc/prime/forced_boot) by user" fi - ;; - + ;; + log-view) - + if [ -f $prime_logfile ]; then less +G -e $prime_logfile else echo "No logfile in /var/log/prime-select.log" fi - ;; - + ;; + log-clean) - + if [ -f $prime_logfile ]; then check_root - rm $prime_logfile - echo "$prime_logfile removed!" - else - echo "$prime_logfile is already clean!" + rm $prime_logfile + echo "$prime_logfile removed!" + else + echo "$prime_logfile is already clean!" fi - ;; - + ;; + *) usage - ;; + ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SUSEPrime-0.7.17/xorg-amd.conf new/SUSEPrime-0.8.2/xorg-amd.conf --- old/SUSEPrime-0.7.17/xorg-amd.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/SUSEPrime-0.8.2/xorg-amd.conf 2021-09-07 10:17:29.000000000 +0200 @@ -0,0 +1,16 @@ +Section "ServerLayout" + Identifier "layout" + Screen "amd" + Option "AllowNVIDIAGPUScreens" +EndSection + +Section "Device" + Identifier "amd" + Driver "modesetting" + BusID "PCI:X:X:X" +EndSection + +Section "Screen" + Identifier "amd" + Device "amd" +EndSection
