1
0

- 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
This commit is contained in:
Stefan Dirsch 2023-11-22 13:14:53 +00:00 committed by Git OBS Bridge
parent c3b9d484a1
commit 86e8cc4ee4
3 changed files with 18 additions and 5 deletions

View File

@ -4,13 +4,13 @@
%{kernel_module_directory}/%2-%1/updates/nvidia*.ko %{kernel_module_directory}/%2-%1/updates/nvidia*.ko
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%dir /usr/lib/modprobe.d %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
%dir /usr/lib/dracut/dracut.conf.d %dir /usr/lib/dracut/dracut.conf.d
/usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf /usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf
%else %else
%dir %{_sysconfdir}/modprobe.d %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 %dir /etc/dracut.conf.d
/etc/dracut.conf.d/60-nvidia-%1.conf /etc/dracut.conf.d/60-nvidia-%1.conf
%endif %endif

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Nov 21 21:05:50 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com> Mon Nov 13 15:37:46 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -156,12 +156,16 @@ MODPROBE_DIR=%{buildroot}%{_sysconfdir}/modprobe.d
mkdir -p $MODPROBE_DIR mkdir -p $MODPROBE_DIR
for flavor in %flavors_to_build; do 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 blacklist nouveau
options nvidia-drm modeset=1 fbdev=1 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 EOF
echo -n "install nvidia " >> $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/50-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 # 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 # module is loaded in initrd; so better let's load all the nvidia modules
# later ... # later ...