Merge pull request #6658 from heitbaum/kernel519

linux: update to 5.19.y
CoreELEC · Aug 1, 2022 · e4deafb · e4deafb
2 parents c9c09cc + c58c03c
commit e4deafb
Show file tree

Hide file tree

Showing 31 changed files with 1,882 additions and 2,138 deletions.
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -28,8 +28,8 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   *)
-    PKG_VERSION="5.18.14"
-    PKG_SHA256="e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af"
+    PKG_VERSION="5.19"
+    PKG_SHA256="ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;

diff --git a/packages/linux/patches/default/fs-ntfs3-since-5-15.patch b/packages/linux/patches/default/fs-ntfs3-since-5-15.patch
diff --git a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.19.patch b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.19.patch
@@ -0,0 +1,22 @@
+--- a/kernel/nvidia-drm/nvidia-dma-resv-helper.h	2022-05-12 22:42:02.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-dma-resv-helper.h	2022-06-29 08:19:44.859696269 +0000
+@@ -23,6 +23,7 @@
+ #ifndef __NVIDIA_DMA_RESV_HELPER_H__
+ #define __NVIDIA_DMA_RESV_HELPER_H__
+
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h"
+
+ #if defined(NV_DRM_FENCE_AVAILABLE)
+@@ -69,7 +70,11 @@
+                                               nv_dma_fence_t *fence)
+ {
+ #if defined(NV_LINUX_DMA_RESV_H_PRESENT)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
++    dma_resv_add_fence(obj, fence, DMA_RESV_USAGE_WRITE);
++#else
+     dma_resv_add_excl_fence(obj, fence);
++#endif
+ #else
+     reservation_object_add_excl_fence(obj, fence);
+ #endif