From a1560bbb9bdabafd4698218e78379d6115930c69 Mon Sep 17 00:00:00 2001 From: graysky Date: Thu, 31 Dec 2020 06:00:15 -0500 Subject: [PATCH] Update to 340.108-13 --- .SRCINFO | 4 +++- 0004-kernel-5.10.patch | 18 ++++++++++++++++++ PKGBUILD | 7 +++++-- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 0004-kernel-5.10.patch diff --git a/.SRCINFO b/.SRCINFO index 9dfffa6..dc9114f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nvidia-340xx pkgdesc = NVIDIA drivers for linux, 340xx legacy branch pkgver = 340.108 - pkgrel = 12 + pkgrel = 13 url = https://www.nvidia.com/ arch = x86_64 license = custom @@ -14,10 +14,12 @@ pkgbase = nvidia-340xx source = 0001-kernel-5.7.patch source = 0002-kernel-5.8.patch source = 0003-kernel-5.9.patch + source = 0004-kernel-5.10.patch b2sums = 6538bbec53b10f8d20977f9b462052625742e9709ef06e24cf2e55de5d0c55f1620a4bb21396cfd89ebc54c32f921ea17e3e47eaa95abcbc24ecbd144fb89028 b2sums = 7150233df867a55f57aa5e798b9c7618329d98459fecc35c4acfad2e9772236cb229703c4fa072381c509279d0588173d65f46297231f4d3bfc65a1ef52e65b1 b2sums = b436095b89d6e294995651a3680ff18b5af5e91582c3f1ec9b7b63be9282497f54f9bf9be3997a5af30eec9b8548f25ec5235d969ac00a667a9cddece63d8896 b2sums = 947cb1f149b2db9c3c4f973f285d389790f73fc8c8a6865fc5b78d6a782f49513aa565de5c82a81c07515f1164e0e222d26c8212a14cf016e387bcc523e3fcb1 + b2sums = 665bf0e1fa22119592e7c75ff40f265e919955f228a3e3e3ebd76e9dffa5226bece5eb032922eb2c009572b31b28e80cd89656f5d0a4ad592277edd98967e68f pkgname = nvidia-340xx pkgdesc = NVIDIA drivers for linux, 340xx legacy branch diff --git a/0004-kernel-5.10.patch b/0004-kernel-5.10.patch new file mode 100644 index 0000000..8bc213c --- /dev/null +++ b/0004-kernel-5.10.patch @@ -0,0 +1,18 @@ +https://github.com/warpme/minimyth2/tree/master/script/nvidia/nvidia-340.108/files + +diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c +--- NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c 2020-12-13 19:10:56.759999937 +0100 ++++ NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c 2020-12-13 19:09:02.039999925 +0100 +@@ -322,8 +322,11 @@ + { + struct nv_gem_object *nv_obj = container_of(obj, struct nv_gem_object, base); + int page_count = obj->size >> PAGE_SHIFT; +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) ++ return drm_prime_pages_to_sg(obj->dev, nv_obj->pages, page_count); ++#else + return drm_prime_pages_to_sg(nv_obj->pages, page_count); ++#endif + } + + static void* nv_gem_prime_vmap( diff --git a/PKGBUILD b/PKGBUILD index 47d9e89..9026944 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=nvidia-340xx pkgname=(nvidia-340xx nvidia-340xx-dkms) pkgver=340.108 -pkgrel=12 +pkgrel=13 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('x86_64') url="https://www.nvidia.com/" @@ -18,11 +18,13 @@ source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Li 0001-kernel-5.7.patch 0002-kernel-5.8.patch 0003-kernel-5.9.patch + 0004-kernel-5.10.patch ) b2sums=('6538bbec53b10f8d20977f9b462052625742e9709ef06e24cf2e55de5d0c55f1620a4bb21396cfd89ebc54c32f921ea17e3e47eaa95abcbc24ecbd144fb89028' '7150233df867a55f57aa5e798b9c7618329d98459fecc35c4acfad2e9772236cb229703c4fa072381c509279d0588173d65f46297231f4d3bfc65a1ef52e65b1' 'b436095b89d6e294995651a3680ff18b5af5e91582c3f1ec9b7b63be9282497f54f9bf9be3997a5af30eec9b8548f25ec5235d969ac00a667a9cddece63d8896' - '947cb1f149b2db9c3c4f973f285d389790f73fc8c8a6865fc5b78d6a782f49513aa565de5c82a81c07515f1164e0e222d26c8212a14cf016e387bcc523e3fcb1') + '947cb1f149b2db9c3c4f973f285d389790f73fc8c8a6865fc5b78d6a782f49513aa565de5c82a81c07515f1164e0e222d26c8212a14cf016e387bcc523e3fcb1' + '665bf0e1fa22119592e7c75ff40f265e919955f228a3e3e3ebd76e9dffa5226bece5eb032922eb2c009572b31b28e80cd89656f5d0a4ad592277edd98967e68f') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" # default is 'linux' substitute custom name here @@ -37,6 +39,7 @@ prepare() { patch -Np1 -i ../0001-kernel-5.7.patch patch -Np1 -i ../0002-kernel-5.8.patch patch -Np1 -i ../0003-kernel-5.9.patch + patch -Np1 -i ../0004-kernel-5.10.patch cp -a kernel kernel-dkms }