rpm/nvidia-open-driver-G06-signed
SHA256
1
0
Fork 0
forked from pool/nvidia-open-driver-G06-signed
Code Pull Requests Activity

Accepting request 1120029 from X11:Drivers:Video:Redesign

Browse Source 
- cleanup: get rid of possibiliy to hardcode pci list; it's no
  longer required anyway; secureboot signing has been fixed ...
- removed pci-table.patch

OBS-URL: https://build.opensuse.org/request/show/1120029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nvidia-open-driver-G06-signed?expand=0&rev=19
This commit is contained in:
Ana Guerrero 2023-10-25 16:02:30 +00:00 committed by Git OBS Bridge
commit 4d07788549
4 changed files with 7 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
generati-pci-table.sh
View File

@ -1,63 +0,0 @@
#!/bin/sh
if [ $# -ne 1 ]; then
echo "$0 <input_file"
exit 1
fi
input=$1
cat > nvidia/nv_pci_table_list.h <<EOF
EOF
cat > nvidia/nv_module_pci_table_list.h <<EOF
EOF
for did in $(cat $input | cut -d " " -f1 ); do
echo $did
cat >> nvidia/nv_pci_table_list.h <<EOF
{
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = $did,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_DISPLAY_VGA << 8),
.class_mask = ~0
},
{
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = $did,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_DISPLAY_3D << 8),
.class_mask = ~0
},
EOF
cat >> nvidia/nv_module_pci_table_list.h <<EOF
{
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = $did,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_DISPLAY_VGA << 8),
.class_mask = ~0
},
{
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = $did,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_DISPLAY_3D << 8),
.class_mask = ~0
},
{
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = $did,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_BRIDGE_OTHER << 8),
.class_mask = ~0
},
EOF
done
cp nvidia/nv_pci_table_list.h nvidia-drm/nv_pci_table_list.h
cp nvidia/nv_module_pci_table_list.h nvidia-drm/nv_module_pci_table_list.h

7
nvidia-open-driver-G06-signed.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 17 13:43:54 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- cleanup: get rid of possibiliy to hardcode pci list; it's no
longer required anyway; secureboot signing has been fixed ...
- removed pci-table.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 11 12:48:01 UTC 2023 - Egbert Eich <eich@suse.com> Wed Oct 11 12:48:01 UTC 2023 - Egbert Eich <eich@suse.com>

24
nvidia-open-driver-G06-signed.spec
View File

@ -16,8 +16,6 @@
# #
%define hardcode_pci_list 0
%if %{undefined kernel_module_directory} %if %{undefined kernel_module_directory}
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
%define kernel_module_directory /usr/lib/modules %define kernel_module_directory /usr/lib/modules
@ -51,11 +49,9 @@ Source9: pci_ids-unsupported-%{version}
Source10: pci_ids-unsupported Source10: pci_ids-unsupported
Source11: pesign-copy-sources Source11: pesign-copy-sources
Source12: pesign-spec-macros Source12: pesign-spec-macros
Source13: generati-pci-table.sh
Source14: group-source-files.pl Source14: group-source-files.pl
Patch0: 0001-Don-t-override-INSTALL_MOD_DIR.patch Patch0: 0001-Don-t-override-INSTALL_MOD_DIR.patch
Patch2: persistent-nvidia-id-string.patch Patch2: persistent-nvidia-id-string.patch
Patch3: pci-table.patch
BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: %{kernel_module_package_buildreqs}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -85,10 +81,8 @@ ExclusiveArch: x86_64 aarch64
echo "%files -n %{name}-${f}-devel -f files-${f}"; \ echo "%files -n %{name}-${f}-devel -f files-${f}"; \
done)} done)}
%if ! 0%{hardcode_pci_list}
## create hardware supplements for manual builds ## create hardware supplements for manual builds
%{load:%{SOURCE12}} %{load:%{SOURCE12}}
%endif
# newer rpmbuilds attach the kernel version and the major part of release to %%pci_id_file of the __kmp_supplements script # newer rpmbuilds attach the kernel version and the major part of release to %%pci_id_file of the __kmp_supplements script
# boo#1190210 # boo#1190210
@ -102,16 +96,6 @@ for GeForce RTX 2000 series and newer GPUs.
%setup -q -n open-gpu-kernel-modules-%{version} %setup -q -n open-gpu-kernel-modules-%{version}
%patch0 -p1 %patch0 -p1
%patch2 -p1 %patch2 -p1
%if 0%{hardcode_pci_list}
%patch3 -p0
pushd kernel-open
%if 0%{?suse_version} >= 1550
sh %{SOURCE13} %{SOURCE2}
%else
sh %{SOURCE13} %{SOURCE9}
%endif
popd
%endif
set -- * set -- *
mkdir source mkdir source
mv "$@" source/ mv "$@" source/
@ -176,15 +160,7 @@ for flavor in %flavors_to_build; do
blacklist nouveau blacklist nouveau
options nvidia-drm modeset=1 options nvidia-drm modeset=1
### Enable support on *all* Turing/Ampere GPUs: Alpha Quality! ### Enable support on *all* Turing/Ampere GPUs: Alpha Quality!
%if 0%{hardcode_pci_list}
%if 0%{?suse_version} >= 1550
#options nvidia NVreg_OpenRmEnableUnsupportedGpus=1 #options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
%else
options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
%endif
%else
#options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
%endif
EOF EOF
echo -n "install nvidia " >> $MODPROBE_DIR/50-nvidia-$flavor.conf 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 tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/50-nvidia-$flavor.conf

114
pci-table.patch
View File

@ -1,114 +0,0 @@
diff -u -r kernel-open.orig/nvidia/nv-pci-table.c kernel-open/nvidia/nv-pci-table.c
--- kernel-open.orig/nvidia/nv-pci-table.c 2023-01-29 14:48:55.126713000 +0100
+++ kernel-open/nvidia/nv-pci-table.c 2023-01-29 14:56:28.901959000 +0100
@@ -28,51 +28,13 @@
/* Devices supported by RM */
struct pci_device_id nv_pci_table[] = {
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_VGA << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_3D << 8),
- .class_mask = ~0
- },
+#include "nv_pci_table_list.h"
{ }
};
/* Devices supported by all drivers in nvidia.ko */
struct pci_device_id nv_module_device_table[] = {
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_VGA << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_3D << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_BRIDGE_OTHER << 8),
- .class_mask = ~0
- },
+#include "nv_module_pci_table_list.h"
{ }
};
diff -u -r kernel-open.orig/nvidia-drm/nv-pci-table.c kernel-open/nvidia-drm/nv-pci-table.c
--- kernel-open.orig/nvidia-drm/nv-pci-table.c 2023-01-29 14:48:51.032916000 +0100
+++ kernel-open/nvidia-drm/nv-pci-table.c 2023-01-29 14:53:47.242620000 +0100
@@ -28,51 +28,13 @@
/* Devices supported by RM */
struct pci_device_id nv_pci_table[] = {
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_VGA << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_3D << 8),
- .class_mask = ~0
- },
+#include "nv_pci_table_list.h"
{ }
};
/* Devices supported by all drivers in nvidia.ko */
struct pci_device_id nv_module_device_table[] = {
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_VGA << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_DISPLAY_3D << 8),
- .class_mask = ~0
- },
- {
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_ANY_ID,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- .class = (PCI_CLASS_BRIDGE_OTHER << 8),
- .class_mask = ~0
- },
+#include "nv_module_pci_table_list.h"
{ }
};