[xtables-addons/f33] Release 3.18
by Leigh Scott
Summary of changes:
39b8655... Release 3.18 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 8 months
[xtables-addons/f34] Release 3.18
by Leigh Scott
Summary of changes:
39b8655... Release 3.18 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 8 months
[nvidia-390xx-kmod] Update patches from Debian
by Henrik Nordström
commit c902d3601ca1de4ead018ac668db2287888232f2
Author: Henrik Nordström <henrik(a)hno.se>
Date: Mon Mar 22 02:58:46 2021 +0100
Update patches from Debian
arm-outer-sync.patch | 2 +-
cc_version_check-gcc5.patch | 2 +-
ignore_xen_on_arm.patch | 2 +-
include-swiotlb-header-on-arm.patch | 17 +++++++++++++++++
kernel-5.7.0-set-memory-array.patch | 12 ++++++------
nvidia-390xx-kmod.spec | 7 ++++++-
nvidia-drm-arm-cflags.patch | 2 +-
7 files changed, 33 insertions(+), 11 deletions(-)
---
diff --git a/arm-outer-sync.patch b/arm-outer-sync.patch
index c8c146a..c2cfb88 100644
--- a/arm-outer-sync.patch
+++ b/arm-outer-sync.patch
@@ -5,7 +5,7 @@ Description: Redefine WRITE_COMBINE_FLUSH on ARM on kernel >= 4.3
is defined. Fall back to no memory barrier at all if that is not configured.
--- a/common/inc/nv-linux.h
+++ b/common/inc/nv-linux.h
-@@ -466,7 +466,13 @@ extern int nv_pat_mode;
+@@ -470,7 +470,13 @@ extern int nv_pat_mode;
#if defined(CONFIG_OUTER_CACHE)
#define OUTER_FLUSH_RANGE(start, end) outer_flush_range((start),(end))
#endif
diff --git a/cc_version_check-gcc5.patch b/cc_version_check-gcc5.patch
index d7edbe7..88a5249 100644
--- a/cc_version_check-gcc5.patch
+++ b/cc_version_check-gcc5.patch
@@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards
--- a/conftest.sh
+++ b/conftest.sh
-@@ -4176,7 +4176,7 @@ case "$6" in
+@@ -4442,7 +4442,7 @@ case "$6" in
kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2`
echo "
diff --git a/ignore_xen_on_arm.patch b/ignore_xen_on_arm.patch
index 48e29fe..fa28dba 100644
--- a/ignore_xen_on_arm.patch
+++ b/ignore_xen_on_arm.patch
@@ -24,7 +24,7 @@ Description: Undef CONFIG_XEN and CONFIG_XEN_DOM0 if building on ARM
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9)
#error "This driver does not support kernels older than 2.6.9!"
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
-@@ -281,7 +286,7 @@ NV_STATUS nvos_forward_error_to_cray(str
+@@ -285,7 +290,7 @@ NV_STATUS nvos_forward_error_to_cray(str
* NVIDIA graphics driver has no way of knowing and is unlikely
* to work correctly.
*/
diff --git a/include-swiotlb-header-on-arm.patch b/include-swiotlb-header-on-arm.patch
new file mode 100644
index 0000000..88357d2
--- /dev/null
+++ b/include-swiotlb-header-on-arm.patch
@@ -0,0 +1,17 @@
+Author: Luca Boccassi <luca.boccassi(a)gmail.com>
+Description: Include linux/swiotlb.h if CONFIG_ARM is defined
+ swiotlb.h is needed by ARM to use dma_ops and family, but nv-linux.h only
+ includes it if CONFIG_ARM64 is set. Patch nv-linux.h to also include it if
+ CONFIG_ARM is set.
+
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -182,7 +182,7 @@ static inline uid_t __kuid_val(kuid_t ui
+ #endif
+ #endif
+
+-#if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
++#if defined(CONFIG_SWIOTLB) && (defined(NVCPU_AARCH64) || defined(NVCPU_ARM))
+ #include <linux/swiotlb.h>
+ #endif
+
diff --git a/kernel-5.7.0-set-memory-array.patch b/kernel-5.7.0-set-memory-array.patch
index 28c9869..5c50840 100644
--- a/kernel-5.7.0-set-memory-array.patch
+++ b/kernel-5.7.0-set-memory-array.patch
@@ -27,7 +27,7 @@ Bug-Debian: https://bugs.debian.org/960735
--- a/conftest.sh
+++ b/conftest.sh
-@@ -405,6 +405,8 @@ compile_test() {
+@@ -428,6 +428,8 @@ compile_test() {
# Determine if the set_memory_uc() function is present.
#
CODE="
@@ -36,7 +36,7 @@ Bug-Debian: https://bugs.debian.org/960735
#if defined(NV_ASM_SET_MEMORY_H_PRESENT)
#if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT)
#include <asm/pgtable_types.h>
-@@ -425,6 +427,8 @@ compile_test() {
+@@ -448,6 +450,8 @@ compile_test() {
# Determine if the set_memory_array_uc() function is present.
#
CODE="
@@ -45,7 +45,7 @@ Bug-Debian: https://bugs.debian.org/960735
#if defined(NV_ASM_SET_MEMORY_H_PRESENT)
#if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT)
#include <asm/pgtable_types.h>
-@@ -480,6 +484,8 @@ compile_test() {
+@@ -503,6 +507,8 @@ compile_test() {
# Determine if the set_pages_uc() function is present.
#
CODE="
@@ -54,7 +54,7 @@ Bug-Debian: https://bugs.debian.org/960735
#if defined(NV_ASM_SET_MEMORY_H_PRESENT)
#if defined(NV_ASM_PGTABLE_TYPES_H_PRESENT)
#include <asm/pgtable_types.h>
-@@ -1858,7 +1864,7 @@ compile_test() {
+@@ -1881,7 +1887,7 @@ compile_test() {
# Determine if atomic_long_t and associated functions are defined
# Added in 2.6.16 2006-01-06 d3cb487149bd706aa6aeb02042332a450978dc1c
CODE="
@@ -63,7 +63,7 @@ Bug-Debian: https://bugs.debian.org/960735
void conftest_atomic_long(void) {
atomic_long_t data;
atomic_long_read(&data);
-@@ -1872,7 +1878,7 @@ compile_test() {
+@@ -1895,7 +1901,7 @@ compile_test() {
atomic64_type)
# Determine if atomic64_t and associated functions are defined
CODE="
@@ -72,7 +72,7 @@ Bug-Debian: https://bugs.debian.org/960735
void conftest_atomic64(void) {
atomic64_t data;
atomic64_read(&data);
-@@ -3508,7 +3514,7 @@ compile_test() {
+@@ -3585,7 +3591,7 @@ compile_test() {
# 2008-01-25 9ee85241fdaab358dff1d8647f20a478cfa512a1
#
CODE="
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 5da5580..766a906 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.141
# Taken over by kmodtool
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -38,6 +38,7 @@ Patch34: cc_version_check-gcc5.patch
#Patch36: nvidia-modeset-use-ARCH.o_binary.patch
# armhf support
+Patch40: include-swiotlb-header-on-arm.patch
Patch41: ignore_xen_on_arm.patch
Patch42: arm-outer-sync.patch
Patch43: nvidia-drm-arm-cflags.patch
@@ -72,6 +73,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch32 -p1 -d kernel
%patch33 -p1 -d kernel
%patch34 -p1 -d kernel
+%patch40 -p1 -d kernel
%patch41 -p1 -d kernel
%patch42 -p1 -d kernel
%patch43 -p1 -d kernel
@@ -101,6 +103,9 @@ done
%changelog
+* Mon Mar 22 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 390.141-6
+- Update patches from Debian.
+
* Mon Mar 22 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.141-5
- Patch for kernel 5.11 (Bug #5951)
diff --git a/nvidia-drm-arm-cflags.patch b/nvidia-drm-arm-cflags.patch
index 6b033ad..0c1b59b 100644
--- a/nvidia-drm-arm-cflags.patch
+++ b/nvidia-drm-arm-cflags.patch
@@ -9,7 +9,7 @@ Description: Add -Wa,-mimplicit-it=thumb to CFLAGS if building on ARM
--- a/conftest.sh
+++ b/conftest.sh
-@@ -193,7 +193,7 @@ build_cflags() {
+@@ -194,7 +194,7 @@ build_cflags() {
done
if [ "$ARCH" = "arm" ]; then
3 years, 8 months
[nvidia-390xx-kmod/f34] Kernel 5.11
by Henrik Nordström
Summary of changes:
84a8bfd... Kernel 5.11 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 8 months
[nvidia-390xx-kmod] Kernel 5.11
by Henrik Nordström
commit 84a8bfdeb138cacfcf3d2646f29b89287fd8c60b
Author: Henrik Nordström <henrik(a)hno.se>
Date: Mon Mar 22 02:43:37 2021 +0100
Kernel 5.11
kernel-5.11.patch | 348 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-390xx-kmod.spec | 8 +-
2 files changed, 355 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.11.patch b/kernel-5.11.patch
new file mode 100644
index 0000000..f08c8fc
--- /dev/null
+++ b/kernel-5.11.patch
@@ -0,0 +1,348 @@
+Adapted by Ike Devolder:
+https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/blob/herecura/linux-5.11.patch
+
+from Joan Bruguera's patch for 460xx:
+https://gist.github.com/joanbm/cf75fc567aef271c830a0fcdfc25a94a
+
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 0d7e516..dae9c09 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -115,7 +115,9 @@
+
+ #include <linux/moduleparam.h> /* module_param() */
+ #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ #include <asm/kmap_types.h> /* page table entry lookup */
++#endif
+
+ #include <linux/pci.h> /* pci_find_class, etc */
+ #include <linux/interrupt.h> /* tasklets, interrupt helpers */
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 23aca36..cc9543b 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1729,6 +1729,8 @@ compile_test() {
+ # Determine if the DRM subsystem is usable
+ #
+ CODE="
++ #include <linux/version.h>
++
+ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
+ #endif
+@@ -1737,6 +1739,10 @@ compile_test() {
+ #include <drm/drm_drv.h>
+ #endif
+
++ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
++ #include <drm/drm_gem.h>
++ #endif
++
+ #if defined(NV_DRM_DRM_PRIME_H_PRESENT)
+ #include <drm/drm_prime.h>
+ #endif
+@@ -1746,13 +1752,22 @@ compile_test() {
+ #endif
+
+ void conftest_drm_available(void) {
+- struct drm_driver drv;
+
+ /* 2013-01-15 89177644a7b6306e6084a89eab7e290f4bfef397 */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++ // Avoid failure due to all the changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++ struct drm_driver drv;
+ drv.gem_prime_pin = 0;
+ drv.gem_prime_get_sg_table = 0;
+ drv.gem_prime_vmap = 0;
+ drv.gem_prime_vunmap = 0;
++#else
++ struct drm_gem_object_funcs gem;
++ gem.pin = 0;
++ gem.get_sg_table = 0;
++ gem.vmap = 0;
++ gem.vunmap = 0;
++#endif
+ (void)drm_gem_prime_import;
+ (void)drm_gem_prime_export;
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c
+index 780df0e..35eb1e4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.c
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.c
+@@ -20,6 +20,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -336,9 +337,19 @@ static int head_modeset_config_attach_connector(
+ * the 'nv_drm_crtc_state::req_config', that is fine becase 'nv_drm_crtc_state'
+ * will be discarded if ->atomic_check() fails.
+ */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
+ struct drm_crtc_state *crtc_state)
++#else
++// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc,
++ struct drm_atomic_state *atomic_state)
++#endif
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
++ // Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(atomic_state, crtc);
++#endif
+ struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc_state);
+ struct NvKmsKapiHeadRequestedConfig *req_config =
+ &nv_crtc_state->req_config;
+@@ -408,8 +419,14 @@ static void nv_drm_crtc_disable(struct drm_crtc *crtc)
+ }
+
+ #ifdef NV_DRM_CRTC_HELPER_FUNCS_HAS_ATOMIC_ENABLE
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc,
+ struct drm_crtc_state *old_crtc_state)
++#else
++// Changes in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++static void nv_drm_crtc_atomic_enable(struct drm_crtc *crtc,
++ struct drm_atomic_state *old_atomic_state)
++#endif
+ {
+
+ }
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index 1b4cc6d..0c26646 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -20,6 +20,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
+
+ #include "nvidia-drm-priv.h"
+@@ -700,10 +701,13 @@ static struct drm_driver nv_drm_driver = {
+ .num_ioctls = ARRAY_SIZE(nv_drm_ioctls),
+
+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++ // Deprecated in favour of equivalent in drm_get_object in torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
+ .gem_prime_export = nv_drm_gem_prime_export,
+ .gem_prime_get_sg_table = nv_drm_gem_prime_get_sg_table,
+ .gem_prime_vmap = nv_drm_gem_prime_vmap,
+ .gem_prime_vunmap = nv_drm_gem_prime_vunmap,
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ .gem_prime_res_obj = nv_drm_gem_prime_res_obj,
+@@ -727,11 +731,14 @@ static struct drm_driver nv_drm_driver = {
+ .desc = "NVIDIA DRM driver",
+ .date = "20160202",
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++ // This is now behind a CONFIG_DRM_LEGACY Kconfig flag.(torvalds/linux commit 57bb1ee6034046be70aed33fd6d447bb2b7261fa)
+ #if defined(NV_DRM_DRIVER_HAS_LEGACY_DEV_LIST)
+ .legacy_dev_list = LIST_HEAD_INIT(nv_drm_driver.legacy_dev_list),
+ #else
+ .device_list = LIST_HEAD_INIT(nv_drm_driver.device_list),
+ #endif
++#endif
+ };
+
+
+@@ -758,8 +765,6 @@ static void nv_drm_update_drm_driver_features(void)
+ nv_drm_driver.dumb_create = nv_drm_dumb_create;
+ nv_drm_driver.dumb_map_offset = nv_drm_dumb_map_offset;
+ nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy;
+-
+- nv_drm_driver.gem_vm_ops = &nv_drm_gem_vma_ops;
+ #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+ }
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
+index 4ac4559..28ef84c 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c
+@@ -20,6 +20,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -32,6 +33,8 @@
+ #include "nvidia-drm-helper.h"
+ #include "nvidia-drm-ioctl.h"
+
++#include "linux/dma-buf.h"
++
+ static inline
+ void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
+ {
+@@ -54,6 +57,7 @@ static struct sg_table *__nv_drm_gem_user_memory_prime_get_sg_table(
+ nv_user_memory->pages_count);
+ }
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void *__nv_drm_gem_user_memory_prime_vmap(
+ struct nv_drm_gem_object *nv_gem)
+ {
+@@ -69,6 +73,28 @@ static void __nv_drm_gem_user_memory_prime_vunmap(
+ {
+ nv_drm_vunmap(address);
+ }
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++static int __nv_drm_gem_user_memory_prime_vmap(
++ struct nv_drm_gem_object *nv_gem,
++ struct dma_buf_map *map)
++{
++ struct nv_drm_gem_user_memory *nv_user_memory = to_nv_user_memory(nv_gem);
++
++ map->vaddr = nv_drm_vmap(nv_user_memory->pages,
++ nv_user_memory->pages_count);
++ map->is_iomem = false;
++ return 0;
++}
++
++static void __nv_drm_gem_user_memory_prime_vunmap(
++ struct nv_drm_gem_object *gem,
++ struct dma_buf_map *map)
++{
++ nv_drm_vunmap(map->vaddr);
++}
++#endif
+
+ static struct nv_drm_gem_object_funcs __nv_gem_user_memory_ops = {
+ .free = __nv_drm_gem_user_memory_free,
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c
+index 4ab8b36..9556993 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -20,6 +20,7 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -29,6 +30,7 @@
+ #include "nvidia-drm-prime-fence.h"
+ #include "nvidia-drm-gem.h"
+ #include "nvidia-dma-resv-helper.h"
++#include "nvidia-drm-gem-nvkms-memory.h"
+
+ #if defined(NV_DRM_DRM_PRIME_H_PRESENT)
+ #include <drm/drm_prime.h>
+@@ -56,6 +58,13 @@ void nv_drm_gem_free(struct drm_gem_object *gem)
+ static struct drm_gem_object_funcs nv_drm_gem_funcs = {
+ .free = nv_drm_gem_free,
+ .get_sg_table = nv_drm_gem_prime_get_sg_table,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0))
++ // New functions moved from drm_driver because of torvalds/linux commit d693def4fd1c23f1ca5aed1afb9993b3a2069ad2
++ .export = drm_gem_prime_export,
++ .vmap = nv_drm_gem_prime_vmap,
++ .vunmap = nv_drm_gem_prime_vunmap,
++ .vm_ops = &nv_drm_gem_vma_ops,
++#endif
+ };
+ #endif
+
+@@ -124,6 +133,7 @@ struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem)
+ return ERR_PTR(-ENOTSUPP);
+ }
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem)
+ {
+ struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
+@@ -143,6 +153,29 @@ void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address)
+ nv_gem->ops->prime_vunmap(nv_gem, address);
+ }
+ }
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map)
++{
++ struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
++
++ if (nv_gem->ops->prime_vmap != NULL) {
++ return nv_gem->ops->prime_vmap(nv_gem, map);
++ }
++
++ return -ENOTSUPP;
++}
++
++void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map)
++{
++ struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem);
++
++ if (nv_gem->ops->prime_vunmap != NULL) {
++ nv_gem->ops->prime_vunmap(nv_gem, map);
++ }
++}
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj)
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index fd64b2d..e12fafb 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -23,6 +23,7 @@
+ #ifndef __NVIDIA_DRM_GEM_H__
+ #define __NVIDIA_DRM_GEM_H__
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_AVAILABLE)
+@@ -44,13 +45,22 @@
+ #include "nvidia-dma-resv-helper.h"
+ #endif
+
++#include "linux/dma-buf.h"
++
+ struct nv_drm_gem_object;
+
+ struct nv_drm_gem_object_funcs {
+ void (*free)(struct nv_drm_gem_object *nv_gem);
+ struct sg_table *(*prime_get_sg_table)(struct nv_drm_gem_object *nv_gem);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ void *(*prime_vmap)(struct nv_drm_gem_object *nv_gem);
+ void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, void *address);
++#else
++ // Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++ // See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++ int (*prime_vmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map);
++ void (*prime_vunmap)(struct nv_drm_gem_object *nv_gem, struct dma_buf_map *map);
++#endif
+ };
+
+ struct nv_drm_gem_object {
+@@ -185,9 +195,17 @@ void nv_drm_gem_object_init(struct nv_drm_device *nv_dev,
+
+ struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem);
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ void *nv_drm_gem_prime_vmap(struct drm_gem_object *gem);
+
+ void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, void *address);
++#else
++// Updated vmap/vunmap operations to use struct dma_buf_map instead of raw pointers
++// See torvalds/linux commits ccc22d41bd9acec58cdc7c3b012e1887aba40af4, 6619ccf1bb1d0ebb071f758111efa83918b216fc
++int nv_drm_gem_prime_vmap(struct drm_gem_object *gem, struct dma_buf_map *map);
++
++void nv_drm_gem_prime_vunmap(struct drm_gem_object *gem, struct dma_buf_map *map);
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+ nv_dma_resv_t* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj);
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 4d0a0b0..5da5580 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.141
# Taken over by kmodtool
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,6 +24,8 @@ Source11: nvidia-390xx-kmodtool-excludekernel-filterfile
# kernel support
Patch10: do-div-cast.patch
Patch11: kernel-5.7.0-set-memory-array.patch
+# https://aur.archlinux.org/cgit/aur.git/plain/kernel-5.11.patch?h=nvidia-3...
+Patch12: kernel-5.11.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -64,6 +66,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# Apply patches
%patch10 -p1 -d kernel
%patch11 -p1 -d kernel
+%patch12 -p2 -d kernel
%patch30 -p1 -d kernel
%patch31 -p1 -d kernel
%patch32 -p1 -d kernel
@@ -98,6 +101,9 @@ done
%changelog
+* Mon Mar 22 2021 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 3:390.141-5
+- Patch for kernel 5.11 (Bug #5951)
+
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3:390.141-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 8 months
[tg_owt] Update to latest snapshot
by Alexey Gorgurov
commit c5587d190040d9eeee00d2e36be654af489d7b0a
Author: Alexey Gorgurov <alexfails(a)fedoraproject.org>
Date: Mon Mar 22 00:20:55 2021 +0300
Update to latest snapshot
.gitignore | 1 +
sources | 6 +++---
tg_owt.spec | 9 ++++++---
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 599f7fe..1b72b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/tg_owt-6eaebec.tar.gz
/tg_owt-be23804.tar.gz
/tg_owt-a198773.tar.gz
+/tg_owt-2d804d2.tar.gz
diff --git a/sources b/sources
index 598d073..d23dc8a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (libvpx-5b63f0f.tar.gz) = 6980b073efae2757a0e2068bd90778baf88a057b1df74380737958e319cd0e6a2fe6ef9462289fb8959a8482a01de4c599f5c52c7dfe78a6142f6c6246af3d19
-SHA512 (libyuv-ad89006.tar.gz) = fbb1b7ab7801c371dfc5b9991fbcd49cec17f8af0ebf210eaa33b8c19b5a7333c0dfc831253628278eb7656b019424f4c33ecf8d8e5629d308f79f3bcbf415ba
-SHA512 (tg_owt-a198773.tar.gz) = 1b7ca215459e8344b2012b9d9e4ebd42113628114f129a2bd2961e2384188402da2f8d17f59ee85f7b83c7760a60a3ba02235105d5227dff7bbc4db6d660ec93
+SHA512 (libvpx-5b63f0f.tar.gz) = f5f5cf02d72b04345600c5c83bc91e4fb220ef324f72686da2aaecbc3c636ab2e2ccf296619fc91a3b7d5dc5e01949817285de13e753c4119486392d987ee937
+SHA512 (libyuv-ad89006.tar.gz) = 0d5b1afeab9d45a3ccfaf9f184e26218c4caccf1d829cbe0ec8522241a5b0b60209754c082086911d2e866ab94776c64c0c1f9acdeac4b1a25fc447053f090ec
+SHA512 (tg_owt-2d804d2.tar.gz) = 33d439bfb03afaba2d38e31d1a168d03a2b26f0c0ce0fbccecab6195a99aff0643769ba62614d35aa2048ffb78a3703178e4dcad8bfa7620e716b736a44fdd5d
diff --git a/tg_owt.spec b/tg_owt.spec
index dc350dd..ed3de82 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -1,8 +1,8 @@
%undefine __cmake_in_source_build
-%global commit0 a19877363082da634a3c851a4698376504d2eaee
+%global commit0 2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date 20210203
+%global date 20210321
# Git revision of libvpx...
%global commit1 5b63f0f821e94f8072eb483014cfc33b05978bb9
@@ -14,7 +14,7 @@
Name: tg_owt
Version: 0
-Release: 7.%{date}git%{shortcommit0}%{?dist}
+Release: 8.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
# abseil-cpp - ASL 2.0
@@ -166,6 +166,9 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%{_libdir}/lib%{name}.so
%changelog
+* Sat Mar 20 2021 Alexey Gorgurov <alexfails(a)fedoraproject.org> - 0-8.20210321git2d804d2
+- Updated to latest Git snapshot.
+
* Wed Feb 24 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-7.20210203gita198773
- Updated to latest Git snapshot.
3 years, 8 months
