From 78807236efaa1be2dee666592972ad5be1092d64 Mon Sep 17 00:00:00 2001
From: Lenard Spencer
Date: Thu, 8 Sep 2022 22:52:16 +0100
Subject: system/nvidia-kernel: New upstream patch.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
---
 system/nvidia-kernel/nvidia-kernel-6.0.patch  | 18 ++++++++++++------
 system/nvidia-kernel/nvidia-kernel.SlackBuild |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'system')

diff --git a/system/nvidia-kernel/nvidia-kernel-6.0.patch b/system/nvidia-kernel/nvidia-kernel-6.0.patch
index 4a9161b59a..58d69c515e 100644
--- a/system/nvidia-kernel/nvidia-kernel-6.0.patch
+++ b/system/nvidia-kernel/nvidia-kernel-6.0.patch
@@ -1,9 +1,15 @@
---- a/kernel/nvidia-drm/nvidia-drm-helper.c	2022-07-20 16:42:53.000000000 +0300
-+++ b/kernel/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/nvidia-drm/nvidia-drm-helper.h	2022-07-20 09:42:52.000000000 -0400
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h	2022-09-07 20:36:36.725936810 -0400
+@@ -109,6 +109,11 @@
   */
+ #include <drm/drm_crtc.h>
  
- #include "nvidia-drm-helper.h"
++#include <linux/version.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
 +#include <drm/drm_framebuffer.h>
- 
- #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-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 005f5eda12..95530cc89f 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-kernel
 VERSION=${VERSION:-515.65.01}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -89,6 +89,7 @@ find -L . \
 patch -p1 < $CWD/nvidia-kernel-6.0.patch
 
 (cd kernel || exit 1
+
 # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
 # message.  If you custom-build your kernel with clang,
 # then pass CC=clang to this script.
-- 
cgit v1.2.3