[nvidia-390xx-kmod] Kernel 5.14 patch from openSUSE
by Henrik Nordström
commit c093f408d381c97cd2300665fc0facda926bd750
Author: Henrik Nordström <henrik(a)hno.se>
Date: Wed Sep 22 22:42:57 2021 +0200
Kernel 5.14 patch from openSUSE
kernel-5.14.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-390xx-kmod.spec | 10 +++++--
2 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
new file mode 100644
index 0000000..e6a11c0
--- /dev/null
+++ b/kernel-5.14.patch
@@ -0,0 +1,79 @@
+diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh
+--- NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh 2021-08-31 16:58:57.799629833 +0200
++++ NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh 2021-08-31 18:00:09.257825534 +0200
+@@ -4493,6 +4493,30 @@ compile_test() {
+ fi
+ ;;
+
++ drm_device_has_pdev)
++ #
++ # Determine if the 'drm_device' structure has a 'pdev' field.
++ #
++ # Removed by commit b347e04452ff ("drm: Remove pdev field from
++ # struct drm_device") in v5.14-rc1.
++ #
++ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
++ #include <drm/drmP.h>
++ #endif
++
++ #if defined(NV_DRM_DRM_DEVICE_H_PRESENT)
++ #include <drm/drm_device.h>
++ #endif
++
++ int conftest_drm_device_has_pdev(void) {
++ return offsetof(struct drm_device, pdev);
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_DEVICE_HAS_PDEV" "" "types"
++ ;;
++
++
+ esac
+ }
+
+diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c
+--- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c 2021-08-31 16:58:57.787629590 +0200
++++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c 2021-08-31 17:51:49.207744327 +0200
+@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign
+ // the requested timeout has expired, loop until less
+ // than a jiffie of the desired delay remains.
+ //
+- current->state = TASK_INTERRUPTIBLE;
++ set_current_state(TASK_INTERRUPTIBLE);
+ do
+ {
+ schedule_timeout(jiffies);
+diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c
+--- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c 2021-08-31 16:58:57.787629590 +0200
++++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c 2021-08-31 17:51:58.043922420 +0200
+@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil
+ // the requested timeout has expired, loop until less
+ // than a jiffie of the desired delay remains.
+ //
+- current->state = TASK_INTERRUPTIBLE;
++ set_current_state(TASK_INTERRUPTIBLE);
+ do
+ {
+ schedule_timeout(jiffies);
+diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c
+--- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c 2021-08-31 16:58:57.783629508 +0200
++++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c 2021-08-31 17:56:41.345633279 +0200
+@@ -811,7 +811,9 @@ static void nv_drm_register_drm_device(c
+
+ dev->dev_private = nv_dev;
+ nv_dev->dev = dev;
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+ dev->pdev = pdev;
++#endif
+
+ /* Register DRM device to DRM sub-system */
+
+diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild
+--- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 16:58:57.783629508 +0200
++++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 17:53:18.265539346 +0200
+@@ -102,3 +102,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_dr
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_atomic_check_has_atomic_state_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_plane_atomic_check_has_atomic_state_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index c2b1008..09351de 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.144
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,11 +24,13 @@ Source11: nvidia-390xx-kmodtool-excludekernel-filterfile
# Debian https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers/-/tree/390xx...
# Arch https://aur.archlinux.org/packages/nvidia-390xx-dkms/
# https://gitlab.com/herecura/packages/nvidia-390xx-dkms/
+# openSUSE https://build.opensuse.org/package/show/home:luc14n0:nvidia/nvidia-gfxG04
# kernel support
Patch10: do-div-cast.patch
Patch11: kernel-5.12.patch
Patch12: https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/ker...
+Patch13: https://build.opensuse.org/source/home:luc14n0:nvidia/nvidia-gfxG04/kerne...
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -71,6 +73,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch10 -p1 -b 10 -d kernel
%patch11 -p2 -b 11 -d kernel
%patch12 -p2 -b 12 -d kernel
+%patch13 -p2 -b 12 -d kernel
%patch30 -p1 -b 30 -d kernel
%patch31 -p1 -b 31 -d kernel
%patch32 -p1 -b 32 -d kernel
@@ -106,6 +109,9 @@ done
%changelog
+* Wed Sep 22 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.144-3
+- Kernel 5.14 patch taken from openSUSE
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3:390.144-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
@@ -113,7 +119,7 @@ done
- Update to 390.144
* Sun Jun 27 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.143-2
-- Kernel 5.12 patch taken from OpenSuSE via Arch repo
+- Kernel 5.12 patch taken from openSUSE via Arch repo
- Kernel 5.13 patch taken from Herecura Arch repo
* Tue Apr 20 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.143-1
2 years, 7 months
[discord/f35] Update 0.0.16
by Sérgio M. Basto
Summary of changes:
5f4b524... Update 0.0.16 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 7 months
[discord] Update 0.0.16
by Sérgio M. Basto
commit 5f4b5244d1a10dea1a0e0dcf65f5e9f74b398414
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Sep 22 21:22:19 2021 +0100
Update 0.0.16
.gitignore | 1 +
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15327f8..a288beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/discord-0.0.13.tar.gz
/discord-0.0.14.tar.gz
/discord-0.0.15.tar.gz
+/discord-0.0.16.tar.gz
diff --git a/discord.spec b/discord.spec
index 564b3bc..7f9b27a 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,8 +3,8 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.15
-Release: 2%{?dist}
+Version: 0.0.16
+Release: 1%{?dist}
Summary: All-in-one voice and text chat for gamers
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -63,6 +63,9 @@ discord.desktop
%changelog
+* Wed Sep 22 2021 Sérgio Basto <sergio(a)serjux.com> - 0.0.16-1
+- Update 0.0.16
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 39f80c3..b0bd0d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.15.tar.gz) = 4f220ecd0e0c9fcd793ed065055479391506d9401b75ca541cde4136d0290f2720fccca87139091faf269fdb2c020adb5b7333710a31ca603ce8552f3dd4841b
+SHA512 (discord-0.0.16.tar.gz) = b95ae338c5abb7c4ba20af761822fc9fb53fd0cb79da16c00ee2df0518bb860a0300e4d0ad9c49b7e1a128ad9ac6d8294b77d2ac4fb8ae9844632c2d6ae7979e
2 years, 7 months
[xorg-x11-drv-nvidia-340xx/f35] (5 commits) ...Update conflicts
by Nicolas Chauvet
Summary of changes:
1ead0ca... Revert "Drop isa requires on -cuda sub-package" (*)
858e0ec... Revert "Drop Virtual provides" (*)
4997122... Update -cuda arched requires for el8+ (*)
1e8ca38... Update changelog (*)
1d8e104... Update conflicts (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 7 months
[xorg-x11-drv-nvidia-340xx] Update conflicts
by Nicolas Chauvet
commit 1d8e104f1ece662d898362f3ab3b3e8c4ddccbf2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 22 13:28:28 2021 +0200
Update conflicts
xorg-x11-drv-nvidia-340xx.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index 7a65bb1..7e4b220 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -55,6 +55,9 @@ Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-fglrx
Conflicts: xorg-x11-drv-catalyst
+#No more updates
+Conflicts: Xorg >= 1.20.99
+
%if 0%{?fedora} || 0%{?rhel} >= 7
%global __provides_exclude ^(lib.*GL.*\\.so.*|libOpenCL\\.so.*)$
%global __requires_exclude ^(lib.*GL.*\\.so.*|libOpenCL\\.so.*)$
@@ -518,6 +521,7 @@ fi ||:
%changelog
* Wed Sep 22 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.108-8
- Update arched requires on el8+
+- Add Conflicts for newer Xorg releases
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.108-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
2 years, 7 months
[xorg-x11-drv-nvidia-340xx] Update changelog
by Nicolas Chauvet
commit 1e8ca382a723d421f893fa53e408cfbaf8c1bd63
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 22 13:25:17 2021 +0200
Update changelog
xorg-x11-drv-nvidia-340xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index 74134a0..7a65bb1 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-340xx
Epoch: 1
Version: 340.108
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: NVIDIA's 340xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -516,6 +516,9 @@ fi ||:
%changelog
+* Wed Sep 22 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.108-8
+- Update arched requires on el8+
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.108-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
2 years, 7 months
[xorg-x11-drv-nvidia-340xx] Update -cuda arched requires for el8+
by Nicolas Chauvet
commit 4997122ebf786644c3602fd00e68ecb207f94b2c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 22 13:24:53 2021 +0200
Update -cuda arched requires for el8+
xorg-x11-drv-nvidia-340xx.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index d671343..74134a0 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -89,7 +89,9 @@ http://rpmfusion.org/Howto/NVIDIA
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%ifarch x86_64
Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release}
+%endif
#Don't put an epoch here
Provides: cuda-drivers-devel = %{version}
2 years, 7 months
[xorg-x11-drv-nvidia-340xx] Revert "Drop Virtual provides"
by Nicolas Chauvet
commit 858e0ec1b05cc1d2777290565c1e1b91ef408e79
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 22 13:23:49 2021 +0200
Revert "Drop Virtual provides"
This reverts commit cf06fc5300d1b1d9942971f78c570408af2e63fb.
xorg-x11-drv-nvidia-340xx.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia-340xx.spec b/xorg-x11-drv-nvidia-340xx.spec
index a49e4ee..d671343 100644
--- a/xorg-x11-drv-nvidia-340xx.spec
+++ b/xorg-x11-drv-nvidia-340xx.spec
@@ -91,6 +91,10 @@ Group: Development/Libraries
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release}
+#Don't put an epoch here
+Provides: cuda-drivers-devel = %{version}
+Provides: cuda-drivers-devel%{_isa} = %{version}
+
%description devel
This package provides the development files of the %{name} package,
such as OpenGL headers.
2 years, 7 months