[nvidia-340xx-kmod] Adding patch for kernel 5.9
by Thaison Nguyen
commit a1684e46c944d0002f97397e345d6e802b8bea45
Author: Thaison Nguyen <thieson08(a)me.com>
Date: Wed Dec 2 07:29:08 2020 +0100
Adding patch for kernel 5.9
kernel-5.9.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
---
diff --git a/kernel-5.9.patch b/kernel-5.9.patch
new file mode 100644
index 0000000..b2ed23d
--- /dev/null
+++ b/kernel-5.9.patch
@@ -0,0 +1,88 @@
+diff -Naur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c 2020-08-26 14:28:09.350000000 +0200
++++ b/kernel/nv.c 2020-08-26 14:35:42.856666666 +0200
+@@ -2785,8 +2785,12 @@
+
+ #if defined(CONFIG_VGA_ARB)
+ #if defined(VGA_DEFAULT_DEVICE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
++#else
+ vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
+ #endif
++#endif
+ vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
+ #endif
+
+diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c 2020-08-26 14:28:09.506666667 +0200
++++ b/kernel/nv-drm.c 2020-08-26 14:48:58.443333335 +0200
+@@ -373,7 +373,11 @@
+ .set_busid = drm_pci_set_busid,
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ .gem_free_object_unlocked = nv_gem_free,
++#else
+ .gem_free_object = nv_gem_free,
++#endif
+
+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+ .gem_prime_export = drm_gem_prime_export,
+@@ -470,8 +474,12 @@
+ #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
+ drm_gem_object_put_unlocked(&nv_obj->base);
+ #else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ drm_gem_object_put_locked(&nv_obj->base);
++#else
+ drm_gem_object_unreference_unlocked(&nv_obj->base);
+ #endif
++#endif
+
+ status = RM_OK;
+
+diff -Naur a/kernel/nv-linux.h b/kernel/nv-linux.h
+--- a/kernel/nv-linux.h 2020-08-26 14:28:09.583333333 +0200
++++ b/kernel/nv-linux.h 2020-08-26 14:53:45.693333299 +0200
+@@ -136,8 +136,10 @@
+
+ #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
+ #include <linux/syscalls.h> /* sys_ioctl() */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ #include <linux/ioctl32.h> /* register_ioctl32_conversion() */
+ #endif
++#endif
+
+ #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
+ !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
+@@ -2249,10 +2251,13 @@
+ pages, vmas, NULL);
+
+ #else
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ return get_user_pages_remote(mm, start, nr_pages, flags,
++ pages, vmas, NULL);
++#else
+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
+-
++#endif
+ #endif
+
+ }
+diff -Naur a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
+--- a/kernel/uvm/nvidia_uvm_linux.h 2019-12-11 23:04:24.000000000 +0100
++++ b/kernel/uvm/nvidia_uvm_linux.h 2020-10-18 20:13:35.701550371 +0200
+@@ -158,8 +158,10 @@
+
+ #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
+ #include <linux/syscalls.h> /* sys_ioctl() */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ #include <linux/ioctl32.h> /* register_ioctl32_conversion() */
+ #endif
++#endif
+
+ #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
+ !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
3 years, 11 months
[kodi-inputstream-adaptive/f33] Update to 2.6.6
by Mohamed ElMorabity
commit 1e8c5061382075f5829abf90afc907b77d70da67
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Dec 1 11:30:11 2020 +0100
Update to 2.6.6
kodi-inputstream-adaptive.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 388b198..473ff9b 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -5,7 +5,7 @@
# %%undefine __cmake_in_source_build
Name: kodi-inputstream-adaptive
-Version: 2.6.4
+Version: 2.6.6
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -18,7 +18,7 @@ Source0: %{url}/archive/%{version}-%{kodi_branch}/%{aname}-%{version}-%{k
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
-BuildRequires: expat-devel
+BuildRequires: pkgconfig(expat)
Requires: kodi >= %{kodi_version}
Provides: bundled(bento4)
@@ -59,7 +59,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{aname}/*.so
%changelog
-* Mon Nov 16 20:36:41 CET 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.4-1
+* Mon Nov 30 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.6-1
+- Update to 2.6.6
+
+* Mon Nov 16 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.4-1
- Update to 2.6.4
* Wed Aug 19 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.0-1
3 years, 11 months
[kodi-inputstream-adaptive] Update to 2.6.6
by Mohamed ElMorabity
commit 90ad0adb3385187412d3bb1db068fa6cd27de100
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Dec 1 11:30:11 2020 +0100
Update to 2.6.6
kodi-inputstream-adaptive.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 388b198..473ff9b 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -5,7 +5,7 @@
# %%undefine __cmake_in_source_build
Name: kodi-inputstream-adaptive
-Version: 2.6.4
+Version: 2.6.6
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -18,7 +18,7 @@ Source0: %{url}/archive/%{version}-%{kodi_branch}/%{aname}-%{version}-%{k
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
-BuildRequires: expat-devel
+BuildRequires: pkgconfig(expat)
Requires: kodi >= %{kodi_version}
Provides: bundled(bento4)
@@ -59,7 +59,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{aname}/*.so
%changelog
-* Mon Nov 16 20:36:41 CET 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.4-1
+* Mon Nov 30 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.6-1
+- Update to 2.6.6
+
+* Mon Nov 16 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.4-1
- Update to 2.6.4
* Wed Aug 19 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 2.6.0-1
3 years, 11 months
