From 86e8cc4ee4cd9dc251d8ef4ed1f73d54bbd1d3f07cae067f080953c0f3b39805 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 22 Nov 2023 13:14:53 +0000 Subject: [PATCH 1/2] - use different modprobe.d config file to resolve conflict with older driver package (boo#1217370); overwrite NVreg_OpenRMEnableSupporteGpus driver option setting (disable it), since letting it enabled is supposed to break booting (boo#1215981, comment#23) OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=64 --- kmp-filelist | 4 ++-- nvidia-open-driver-G06-signed.changes | 9 +++++++++ nvidia-open-driver-G06-signed.spec | 10 +++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/kmp-filelist b/kmp-filelist index 3147796..e753b01 100644 --- a/kmp-filelist +++ b/kmp-filelist @@ -4,13 +4,13 @@ %{kernel_module_directory}/%2-%1/updates/nvidia*.ko %if 0%{?suse_version} >= 1550 %dir /usr/lib/modprobe.d -%config /usr/lib/modprobe.d/50-nvidia-%1.conf +%config /usr/lib/modprobe.d/60-nvidia-%1.conf %dir /usr/lib/dracut %dir /usr/lib/dracut/dracut.conf.d /usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf %else %dir %{_sysconfdir}/modprobe.d -%config %{_sysconfdir}/modprobe.d/50-nvidia-%1.conf +%config %{_sysconfdir}/modprobe.d/60-nvidia-%1.conf %dir /etc/dracut.conf.d /etc/dracut.conf.d/60-nvidia-%1.conf %endif diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index a38de07..bef8f1b 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 21 21:05:50 UTC 2023 - Stefan Dirsch + +- use different modprobe.d config file to resolve conflict with + older driver package (boo#1217370); overwrite + NVreg_OpenRMEnableSupporteGpus driver option setting (disable it), + since letting it enabled is supposed to break booting (boo#1215981, + comment#23) + ------------------------------------------------------------------- Mon Nov 13 15:37:46 UTC 2023 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 90e3491..bbf3982 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -156,12 +156,16 @@ MODPROBE_DIR=%{buildroot}%{_sysconfdir}/modprobe.d mkdir -p $MODPROBE_DIR for flavor in %flavors_to_build; do - cat > $MODPROBE_DIR/50-nvidia-$flavor.conf << EOF + cat > $MODPROBE_DIR/60-nvidia-$flavor.conf << EOF blacklist nouveau options nvidia-drm modeset=1 fbdev=1 +# having set NVreg_OpenRMEnableSupporteGpus=1 in 50-nvidia-$flavor.conf +# of older driver 535.xx.yy driver is supposed to break booting, so let's +# overwrite it (boo#1215981, comment#23) +options nvidia NVreg_OpenRMEnableSupporteGpus=0 EOF - echo -n "install nvidia " >> $MODPROBE_DIR/50-nvidia-$flavor.conf - tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/50-nvidia-$flavor.conf + echo -n "install nvidia " >> $MODPROBE_DIR/60-nvidia-$flavor.conf + tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/60-nvidia-$flavor.conf # otherwise nvidia-uvm is missing in initrd and won't get loaded when nvidia # module is loaded in initrd; so better let's load all the nvidia modules # later ... From de7d50fb6970fba456355a2f468cb546a00cf5303b3990adf5ee1757319967e2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 22 Nov 2023 13:22:52 +0000 Subject: [PATCH 2/2] - no longer try to overwrite NVreg_OpenRMEnableSupporteGpus driver option setting; apparently it's ignored by the driver (boo#1215981, comment#26) OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=65 --- nvidia-open-driver-G06-signed.changes | 7 +++++++ nvidia-open-driver-G06-signed.spec | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index bef8f1b..2d7dadb 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 22 13:16:01 UTC 2023 - Stefan Dirsch + +- no longer try to overwrite NVreg_OpenRMEnableSupporteGpus driver + option setting; apparently it's ignored by the driver (boo#1215981, + comment#26) + ------------------------------------------------------------------- Tue Nov 21 21:05:50 UTC 2023 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index bbf3982..733beb0 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -159,10 +159,6 @@ for flavor in %flavors_to_build; do cat > $MODPROBE_DIR/60-nvidia-$flavor.conf << EOF blacklist nouveau options nvidia-drm modeset=1 fbdev=1 -# having set NVreg_OpenRMEnableSupporteGpus=1 in 50-nvidia-$flavor.conf -# of older driver 535.xx.yy driver is supposed to break booting, so let's -# overwrite it (boo#1215981, comment#23) -options nvidia NVreg_OpenRMEnableSupporteGpus=0 EOF echo -n "install nvidia " >> $MODPROBE_DIR/60-nvidia-$flavor.conf tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/60-nvidia-$flavor.conf