[nvidia-340xx-kmod/f33] Patch for kernel-5.14.0
by wojnilowicz
commit 462c0c0d2ce3e9176c1dc26d63ff833f5835ab67
Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>
Date: Thu Nov 11 14:01:46 2021 +0100
Patch for kernel-5.14.0
kernel-5.14.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 154 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
new file mode 100644
index 0000000..cbc8d63
--- /dev/null
+++ b/kernel-5.14.patch
@@ -0,0 +1,148 @@
+diff --git a/kernel/conftest.Kbuild b/kernel/conftest.Kbuild
+index 69643cd..1778e87 100644
+--- a/kernel/conftest.Kbuild
++++ b/kernel/conftest.Kbuild
+@@ -87,6 +87,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_prime_flag_present
+
+ NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_object_find_has_file_priv_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_prime_pages_to_sg_has_drm_device_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_has_resv
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index f2e4c91..a21c5bd 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4654,6 +4654,29 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
+ ;;
++
++ 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 --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 9e0b9c5..45cab9b 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -70,20 +70,35 @@ struct nv_gem_object {
+ struct page **pages;
+ };
+
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++#include <drm/drm_legacy.h>
++struct nv_drm_extra_priv_data {
++ struct pci_dev *pdev;
++ struct drm_agp_head *agp;
++};
++#endif
++
+ static int nv_drm_load(
+ struct drm_device *dev,
+ unsigned long flags
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
+- nvl->drm = dev;
+- return 0;
+- }
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
++ nvl->drm = dev;
++ return 0;
++ }
+ }
+
+ return -ENODEV;
+@@ -100,11 +115,18 @@ static int __nv_drm_unload(
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
+ return 0;
+@@ -347,6 +369,7 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+ {
+ struct nv_drm_device *nv_dev = NULL;
+ struct drm_device *dev = NULL;
++ struct nv_drm_extra_priv_data *extra;
+ struct pci_dev *pdev = gpu_info->os_dev_ptr;
+
+ DRM_DEBUG(
+@@ -380,7 +403,14 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+
+ dev->dev_private = nv_dev;
+ nv_dev->dev = dev;
++
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+ dev->pdev = pdev;
++#else
++ extra = kzalloc(sizeof(*extra), GFP_KERNEL);
++ extra->pdev = pdev;
++ dev->dev_private = extra;
++#endif
+
+ /* Register DRM device to DRM sub-system */
+
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 0c0dc05..452609d 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -549,7 +549,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ // 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 --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 60c2271..6f40d08 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.108
# Taken over by kmodtool
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@ Patch2: kernel-5.8.patch
Patch3: kernel-5.9.patch
Patch4: kernel-5.10.patch
Patch5: kernel-5.11.patch
+Patch6: kernel-5.14.patch
BuildRequires: elfutils-libelf-devel
BuildRequires: gcc
@@ -56,6 +57,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +87,9 @@ done
%{?akmod_install}
%changelog
+* Thu Nov 11 2021 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-14
+- Patch for kernel-5.14.0
+
* Sun Jun 27 2021 Thaison Nguyen <thieson08(a)me.com> - 1:340.108-13
- Fix patch for kernel-5.11.0 (Thanks at Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>)
3 years
[nvidia-340xx-kmod/f34] Patch for kernel-5.14.0
by wojnilowicz
commit f03cf534ae165c95a53e92c25fabaae5b52d8c87
Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>
Date: Thu Nov 11 13:58:22 2021 +0100
Patch for kernel-5.14.0
kernel-5.14.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 154 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
new file mode 100644
index 0000000..cbc8d63
--- /dev/null
+++ b/kernel-5.14.patch
@@ -0,0 +1,148 @@
+diff --git a/kernel/conftest.Kbuild b/kernel/conftest.Kbuild
+index 69643cd..1778e87 100644
+--- a/kernel/conftest.Kbuild
++++ b/kernel/conftest.Kbuild
+@@ -87,6 +87,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_prime_flag_present
+
+ NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_object_find_has_file_priv_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_prime_pages_to_sg_has_drm_device_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_has_resv
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index f2e4c91..a21c5bd 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4654,6 +4654,29 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
+ ;;
++
++ 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 --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 9e0b9c5..45cab9b 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -70,20 +70,35 @@ struct nv_gem_object {
+ struct page **pages;
+ };
+
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++#include <drm/drm_legacy.h>
++struct nv_drm_extra_priv_data {
++ struct pci_dev *pdev;
++ struct drm_agp_head *agp;
++};
++#endif
++
+ static int nv_drm_load(
+ struct drm_device *dev,
+ unsigned long flags
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
+- nvl->drm = dev;
+- return 0;
+- }
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
++ nvl->drm = dev;
++ return 0;
++ }
+ }
+
+ return -ENODEV;
+@@ -100,11 +115,18 @@ static int __nv_drm_unload(
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
+ return 0;
+@@ -347,6 +369,7 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+ {
+ struct nv_drm_device *nv_dev = NULL;
+ struct drm_device *dev = NULL;
++ struct nv_drm_extra_priv_data *extra;
+ struct pci_dev *pdev = gpu_info->os_dev_ptr;
+
+ DRM_DEBUG(
+@@ -380,7 +403,14 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+
+ dev->dev_private = nv_dev;
+ nv_dev->dev = dev;
++
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+ dev->pdev = pdev;
++#else
++ extra = kzalloc(sizeof(*extra), GFP_KERNEL);
++ extra->pdev = pdev;
++ dev->dev_private = extra;
++#endif
+
+ /* Register DRM device to DRM sub-system */
+
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 0c0dc05..452609d 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -549,7 +549,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ // 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 --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 60c2271..6f40d08 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.108
# Taken over by kmodtool
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@ Patch2: kernel-5.8.patch
Patch3: kernel-5.9.patch
Patch4: kernel-5.10.patch
Patch5: kernel-5.11.patch
+Patch6: kernel-5.14.patch
BuildRequires: elfutils-libelf-devel
BuildRequires: gcc
@@ -56,6 +57,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +87,9 @@ done
%{?akmod_install}
%changelog
+* Thu Nov 11 2021 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-14
+- Patch for kernel-5.14.0
+
* Sun Jun 27 2021 Thaison Nguyen <thieson08(a)me.com> - 1:340.108-13
- Fix patch for kernel-5.11.0 (Thanks at Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>)
3 years
[nvidia-340xx-kmod/f35] Patch for kernel-5.14.0
by wojnilowicz
commit 6532cdd0ace61d978100e27e20cf1df6df0434ec
Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>
Date: Thu Nov 11 13:53:02 2021 +0100
Patch for kernel-5.14.0
kernel-5.14.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 154 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
new file mode 100644
index 0000000..cbc8d63
--- /dev/null
+++ b/kernel-5.14.patch
@@ -0,0 +1,148 @@
+diff --git a/kernel/conftest.Kbuild b/kernel/conftest.Kbuild
+index 69643cd..1778e87 100644
+--- a/kernel/conftest.Kbuild
++++ b/kernel/conftest.Kbuild
+@@ -87,6 +87,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_prime_flag_present
+
+ NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_object_find_has_file_priv_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_prime_pages_to_sg_has_drm_device_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_has_resv
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index f2e4c91..a21c5bd 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4654,6 +4654,29 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
+ ;;
++
++ 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 --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 9e0b9c5..45cab9b 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -70,20 +70,35 @@ struct nv_gem_object {
+ struct page **pages;
+ };
+
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++#include <drm/drm_legacy.h>
++struct nv_drm_extra_priv_data {
++ struct pci_dev *pdev;
++ struct drm_agp_head *agp;
++};
++#endif
++
+ static int nv_drm_load(
+ struct drm_device *dev,
+ unsigned long flags
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
+- nvl->drm = dev;
+- return 0;
+- }
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
++ nvl->drm = dev;
++ return 0;
++ }
+ }
+
+ return -ENODEV;
+@@ -100,11 +115,18 @@ static int __nv_drm_unload(
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
+ return 0;
+@@ -347,6 +369,7 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+ {
+ struct nv_drm_device *nv_dev = NULL;
+ struct drm_device *dev = NULL;
++ struct nv_drm_extra_priv_data *extra;
+ struct pci_dev *pdev = gpu_info->os_dev_ptr;
+
+ DRM_DEBUG(
+@@ -380,7 +403,14 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+
+ dev->dev_private = nv_dev;
+ nv_dev->dev = dev;
++
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+ dev->pdev = pdev;
++#else
++ extra = kzalloc(sizeof(*extra), GFP_KERNEL);
++ extra->pdev = pdev;
++ dev->dev_private = extra;
++#endif
+
+ /* Register DRM device to DRM sub-system */
+
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 0c0dc05..452609d 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -549,7 +549,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ // 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 --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index d7c3ccc..5eae1a5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.108
# Taken over by kmodtool
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@ Patch2: kernel-5.8.patch
Patch3: kernel-5.9.patch
Patch4: kernel-5.10.patch
Patch5: kernel-5.11.patch
+Patch6: kernel-5.14.patch
BuildRequires: elfutils-libelf-devel
BuildRequires: gcc
@@ -56,6 +57,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +87,9 @@ done
%{?akmod_install}
%changelog
+* Thu Nov 11 2021 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-15
+- Patch for kernel-5.14.0
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.108-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[comskip] Rebuilt for new ffmpeg snapshot
by Leigh Scott
commit d4454205b7f639ec5bfe56ab0951496253be4040
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 11 12:58:46 2021 +0000
Rebuilt for new ffmpeg snapshot
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
comskip.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/comskip.spec b/comskip.spec
index 48ff542..7dec2e4 100644
--- a/comskip.spec
+++ b/comskip.spec
@@ -3,7 +3,7 @@
%define _legacy_common_support 1
Name: comskip
Version: 0.82.009
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A free commercial detector
License: GPLv2+
URL: https://github.com/erikkaashoek/Comskip
@@ -34,6 +34,9 @@ export CFLAGS='%{optflags} -Wno-deprecated-declarations'
%{_bindir}/comskip
%changelog
+* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.82.009-6
+- Rebuilt for new ffmpeg snapshot
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.82.009-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[cmus] Rebuilt for new ffmpeg snapshot
by Leigh Scott
commit 45c62c4caa2c8b456807f90ed0a126dce096f6fb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 11 12:58:34 2021 +0000
Rebuilt for new ffmpeg snapshot
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
cmus.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/cmus.spec b/cmus.spec
index 318f352..2b2b1f8 100644
--- a/cmus.spec
+++ b/cmus.spec
@@ -1,6 +1,6 @@
Name: cmus
Version: 2.9.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Ncurses-Based Music Player
License: GPLv2+
URL: https://cmus.github.io/
@@ -89,6 +89,9 @@ chmod -x examples/*
%changelog
+* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.9.1-4
+- Rebuilt for new ffmpeg snapshot
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[chromaprint-tools] Rebuilt for new ffmpeg snapshot
by Leigh Scott
commit 0e29113376608f79c07289096405a98b239c4cd5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 11 12:51:52 2021 +0000
Rebuilt for new ffmpeg snapshot
Signed-off-by: Leigh Scott <leigh123linux(a)gmail.com>
chromaprint-tools.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/chromaprint-tools.spec b/chromaprint-tools.spec
index 61dad17..5223137 100644
--- a/chromaprint-tools.spec
+++ b/chromaprint-tools.spec
@@ -2,7 +2,7 @@
Name: chromaprint-tools
Version: 1.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Chromaprint audio fingerprinting tools
License: GPLv2+
URL: http://www.acoustid.org/chromaprint
@@ -55,6 +55,9 @@ rm -f %{buildroot}%{_libdir}/lib*.so*
%{_bindir}/fpcalc
%changelog
+* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.5.0-6
+- Rebuilt for new ffmpeg snapshot
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[nvidia-340xx-kmod] Fix date on 340.108-15
by wojnilowicz
commit 0d62b373bbfb19abb5ddb259d05c2aea40623292
Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>
Date: Thu Nov 11 13:42:20 2021 +0100
Fix date on 340.108-15
nvidia-340xx-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 2f224ee..5eae1a5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -87,7 +87,7 @@ done
%{?akmod_install}
%changelog
-* Thu Nov 11 2020 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-15
+* Thu Nov 11 2021 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-15
- Patch for kernel-5.14.0
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.108-14
3 years
[nvidia-340xx-kmod] Patch for kernel-5.14.0
by wojnilowicz
commit 43448b15917b0c2d72f8198f51b52eb4993ba069
Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>
Date: Thu Nov 11 13:32:06 2021 +0100
Patch for kernel-5.14.0
kernel-5.14.patch | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 ++-
2 files changed, 154 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
new file mode 100644
index 0000000..cbc8d63
--- /dev/null
+++ b/kernel-5.14.patch
@@ -0,0 +1,148 @@
+diff --git a/kernel/conftest.Kbuild b/kernel/conftest.Kbuild
+index 69643cd..1778e87 100644
+--- a/kernel/conftest.Kbuild
++++ b/kernel/conftest.Kbuild
+@@ -87,6 +87,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_prime_flag_present
+
+ NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_object_find_has_file_priv_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_prime_pages_to_sg_has_drm_device_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_has_resv
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index f2e4c91..a21c5bd 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4654,6 +4654,29 @@ compile_test() {
+
+ compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
+ ;;
++
++ 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 --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 9e0b9c5..45cab9b 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -70,20 +70,35 @@ struct nv_gem_object {
+ struct page **pages;
+ };
+
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++#include <drm/drm_legacy.h>
++struct nv_drm_extra_priv_data {
++ struct pci_dev *pdev;
++ struct drm_agp_head *agp;
++};
++#endif
++
+ static int nv_drm_load(
+ struct drm_device *dev,
+ unsigned long flags
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
+- nvl->drm = dev;
+- return 0;
+- }
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
++ nvl->drm = dev;
++ return 0;
++ }
+ }
+
+ return -ENODEV;
+@@ -100,11 +115,18 @@ static int __nv_drm_unload(
+ )
+ {
+ nv_linux_state_t *nvl;
++#if !defined(NV_DRM_DEVICE_HAS_PDEV)
++ struct nv_drm_extra_priv_data *extra = dev->dev_private;
++#endif
+
+ for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+ {
+- if (nvl->dev == dev->pdev)
+- {
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
++ if (nvl->dev == dev->pdev)
++#else
++ if (nvl->dev == extra->pdev)
++#endif
++ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
+ return 0;
+@@ -347,6 +369,7 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+ {
+ struct nv_drm_device *nv_dev = NULL;
+ struct drm_device *dev = NULL;
++ struct nv_drm_extra_priv_data *extra;
+ struct pci_dev *pdev = gpu_info->os_dev_ptr;
+
+ DRM_DEBUG(
+@@ -380,7 +403,14 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+
+ dev->dev_private = nv_dev;
+ nv_dev->dev = dev;
++
++#if defined(NV_DRM_DEVICE_HAS_PDEV)
+ dev->pdev = pdev;
++#else
++ extra = kzalloc(sizeof(*extra), GFP_KERNEL);
++ extra->pdev = pdev;
++ dev->dev_private = extra;
++#endif
+
+ /* Register DRM device to DRM sub-system */
+
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 0c0dc05..452609d 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -549,7 +549,7 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+ // 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 --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index d7c3ccc..2f224ee 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.108
# Taken over by kmodtool
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@ Patch2: kernel-5.8.patch
Patch3: kernel-5.9.patch
Patch4: kernel-5.10.patch
Patch5: kernel-5.11.patch
+Patch6: kernel-5.14.patch
BuildRequires: elfutils-libelf-devel
BuildRequires: gcc
@@ -56,6 +57,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +87,9 @@ done
%{?akmod_install}
%changelog
+* Thu Nov 11 2020 Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> - 1:340.108-15
+- Patch for kernel-5.14.0
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:340.108-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[bino] Rebuilt for new ffmpeg snapshot
by Leigh Scott
commit 2a186d7b63816f2ea4ae3538807cd03361f6bb22
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 11 12:21:55 2021 +0000
Rebuilt for new ffmpeg snapshot
bino.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/bino.spec b/bino.spec
index 66f381b..c63a27c 100644
--- a/bino.spec
+++ b/bino.spec
@@ -1,6 +1,6 @@
Name: bino
Version: 1.6.7
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: 3D video player
Group: System Environment/Base
License: GPLv3+
@@ -75,6 +75,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.6.7-10
+- Rebuilt for new ffmpeg snapshot
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.6.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[audacious-plugins-freeworld] Rebuilt for new ffmpeg snapshot
by Leigh Scott
commit bbb52f2f7ac54334c430edb6ac8445d95906b0d8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Nov 11 12:18:56 2021 +0000
Rebuilt for new ffmpeg snapshot
audacious-plugins-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 4f8d54c..6f30e8e 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -6,7 +6,7 @@
Name: audacious-plugins-freeworld
Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional plugins for the Audacious media player
License: GPLv3
URL: https://audacious-media-player.org/
@@ -119,6 +119,9 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.1-3
+- Rebuilt for new ffmpeg snapshot
+
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years