remove broken source patches

4 files changed, 3 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a66a5ab858e..87ee8c97cd84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-430xx-utils
 	pkgver = 430.40
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -8,13 +8,9 @@ pkgbase = nvidia-430xx-utils
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-430xx-utils.sysusers
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/430.40/NVIDIA-Linux-x86_64-430.40-no-compat32.run
-	source = kernel-5.14.patch
-	source = kernel-4.16.patch
 	b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
 	b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
 	b2sums = 3c5f798a6820c96c47024c2f00de9201bd668500c7195c9d221dd102a9ae940227a7dafb6c94e47e9f9e4279036bdf154a598f054a7d92cbe5192131c6cf72b0
-	b2sums = 6aa23c223bf46c1fb792574489c169b0a2855c812bed10021d2bb2adedd8c8d82f5ce36402b10782a515457307ec6d434a1af7d1d9ae7c9765aab4a8f127f0f9
-	b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
 
 pkgname = nvidia-430xx-utils
 	pkgdesc = NVIDIA drivers utilities
diff --git a/PKGBUILD b/PKGBUILD
index daa4a28ee711..353c606af476 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,10 @@ options=('!strip')
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 source=('nvidia-drm-outputclass.conf'
         'nvidia-430xx-utils.sysusers'
-        "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
-        kernel-5.14.patch
-        kernel-4.16.patch)
+        "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
 b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
         'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
-        '093d3f4779a904a9bbbc0d10e1c2b150665d6515bc9bba9fdaeb06c09be4f1029aa742058635f9309d4dca7f5e8e3fcdbe49f74ed6035075315ed3555b648404'
-        '6aa23c223bf46c1fb792574489c169b0a2855c812bed10021d2bb2adedd8c8d82f5ce36402b10782a515457307ec6d434a1af7d1d9ae7c9765aab4a8f127f0f9'
-        'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
+        '093d3f4779a904a9bbbc0d10e1c2b150665d6515bc9bba9fdaeb06c09be4f1029aa742058635f9309d4dca7f5e8e3fcdbe49f74ed6035075315ed3555b648404')
 
 create_links() {
     # create soname links
@@ -37,14 +33,6 @@ prepare() {
 
     sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' nvidia_icd.json.template
 
-    # Restore phys_to_dma support (still needed for 390.138)
-    # From loqs via https://bugs.archlinux.org/task/58074
-    patch -Np1 -i ../kernel-4.16.patch
-
-    # From Stefan Dirsch
-    # https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.14.patch?rev=233
-    patch -Np1 -i ../kernel-5.14.patch
-
     cd kernel
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
     sed -i 's/__JOBS/`nproc`/' dkms.conf
diff --git a/kernel-4.16.patch b/kernel-4.16.patch
deleted file mode 100644
index 737295cdc5fa..000000000000
--- a/kernel-4.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..22ef968 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -174,7 +174,11 @@ static inline uid_t __kuid_val(kuid_t uid)
- 
- #if defined(NV_VM_INSERT_PAGE_PRESENT)
- #include <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#endif
- 
- #if defined(NV_LINUX_DMA_MAP_OPS_H_PRESENT)
- #include <linux/dma-map-ops.h>
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b23dbb4..42dc576 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -2056,7 +2056,12 @@ compile_test() {
-             # Determine if the phys_to_dma function is present.
-             #
-             CODE="
-+            #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-             #include <linux/dma-mapping.h>
-+#else
-+            #include <linux/dma-direct.h>
-+#endif
-             void conftest_phys_to_dma(void) {
-                 phys_to_dma();
-             }"
diff --git a/kernel-5.14.patch b/kernel-5.14.patch
deleted file mode 100644
index a4242ec77f93..000000000000
--- a/kernel-5.14.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.14.patch?rev=233
-Credit to Stefan Dirsch <sndirsch@suse.com>
-
-diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh
---- NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh	2021-08-31 16:58:57.799629833 +0200
-+++ NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh	2021-08-31 18:00:09.257825534 +0200
-@@ -4493,6 +4493,30 @@ compile_test() {
-             fi
-         ;;
- 
-+        drm_device_has_pdev)
-+            #
-+            # Determine if the 'drm_device' structure has a 'pdev' field.
-+            #
-+            # Removed by commit b347e04452ff ("drm: Remove pdev field from
-+            # struct drm_device") in v5.14-rc1.
-+            #
-+            CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-+            #include <drm/drmP.h>
-+            #endif
-+
-+            #if defined(NV_DRM_DRM_DEVICE_H_PRESENT)
-+            #include <drm/drm_device.h>
-+            #endif
-+
-+            int conftest_drm_device_has_pdev(void) {
-+                return offsetof(struct drm_device, pdev);
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_DEVICE_HAS_PDEV" "" "types"
-+        ;;
-+
-+
-     esac
- }
- 
-diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c
---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c	2021-08-31 16:58:57.787629590 +0200
-+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c	2021-08-31 17:51:49.207744327 +0200
-@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign
-         // the requested timeout has expired, loop until less
-         // than a jiffie of the desired delay remains.
-         //
--        current->state = TASK_INTERRUPTIBLE;
-+        set_current_state(TASK_INTERRUPTIBLE);
-         do
-         {
-             schedule_timeout(jiffies);
-diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c
---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c	2021-08-31 16:58:57.787629590 +0200
-+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c	2021-08-31 17:51:58.043922420 +0200
-@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil
-         // the requested timeout has expired, loop until less
-         // than a jiffie of the desired delay remains.
-         //
--        current->state = TASK_INTERRUPTIBLE;
-+        set_current_state(TASK_INTERRUPTIBLE);
-         do
-         {
-             schedule_timeout(jiffies);
-diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c
---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c	2021-08-31 16:58:57.783629508 +0200
-+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c	2021-08-31 17:56:41.345633279 +0200
-@@ -811,7 +811,9 @@ static void nv_drm_register_drm_device(c
- 
-     dev->dev_private = nv_dev;
-     nv_dev->dev = dev;
-+#if defined(NV_DRM_DEVICE_HAS_PDEV)
-     dev->pdev = pdev;
-+#endif
- 
-     /* Register DRM device to DRM sub-system */
- 
-diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild
---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild	2021-08-31 16:58:57.783629508 +0200
-+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild	2021-08-31 17:53:18.265539346 +0200
-@@ -102,3 +102,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_dr
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_atomic_check_has_atomic_state_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg
- NV_CONFTEST_TYPE_COMPILE_TESTS += drm_plane_atomic_check_has_atomic_state_arg
-+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev