From 411744566f2b51f269177d41bab97cbad9cfa20c Mon Sep 17 00:00:00 2001 From: Lenard Spencer Date: Thu, 8 Sep 2022 22:55:26 +0100 Subject: system/nvidia-open-kernel: New upstream patch. Signed-off-by: Dave Woodfall --- system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch | 18 ++++++++++++------ .../nvidia-open-kernel/nvidia-open-kernel.SlackBuild | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch b/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch index f3d780c026..047d6784ec 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch +++ b/system/nvidia-open-kernel/nvidia-open-kernel-6.0.patch @@ -1,9 +1,15 @@ ---- a/kernel-open/nvidia-drm/nvidia-drm-helper.c 2022-07-20 16:42:53.000000000 +0300 -+++ b/kernel-open/nvidia-drm/nvidia-drm-helper.c 2022-08-20 16:32:34.836742336 +0300 -@@ -28,6 +28,7 @@ +diff -Nur kernel.orig/nvidia-drm/nvidia-drm-helper.h kernel/nvidia-drm/nvidia-drm-helper.h +--- a/kernel-open/nvidia-drm/nvidia-drm-helper.h 2022-07-20 09:42:52.000000000 -0400 ++++ b/kernel-open/nvidia-drm/nvidia-drm-helper.h 2022-09-07 20:36:36.725936810 -0400 +@@ -109,6 +109,11 @@ */ + #include - #include "nvidia-drm-helper.h" ++#include ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)) +#include - - #include "nvmisc.h" ++#endif ++ + #if defined(drm_for_each_plane) + #define nv_drm_for_each_plane(plane, dev) \ + drm_for_each_plane(plane, dev) diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild index 578216e2ce..322368dc89 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild +++ b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-open-kernel VERSION=${VERSION:-515.65.01} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -- cgit v1.2.3