x11-drivers/nvidia-drivers-legacy : version bump

4 files changed, 2 insertions, 85 deletions

diff --git a/x11-drivers/nvidia-drivers-legacy/Manifest b/x11-drivers/nvidia-drivers-legacy/Manifest
index edb57fcb..957bad0a 100644
--- a/x11-drivers/nvidia-drivers-legacy/Manifest
+++ b/x11-drivers/nvidia-drivers-legacy/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-390.147.run 85930997 BLAKE2B a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc SHA512 0d8bda32e916d71da2ea74bc12a4f3cb0a0c2ddda27511cf3c89bbf4aeb28db68f6b7261639d88dd1c0180b91213c09de930d233158268c5d9ab3b223510e964
+DIST NVIDIA-Linux-x86_64-390.151.run 86025677 BLAKE2B 8f78ee00d15ffac9f371e8302541eee8b033670953850dd770c6615eb674fcda2adcea52582284c59a9d7e32943a445d65515b1cacd6f8e5fcbe6c9e94080fb0 SHA512 aad962e4132c8ab031b5f72e47fbd4b5c49824bc175f13fd2c6fb3e539d41ff9829835ce4928bbfa56aba2ffa43fbe3d8049e9246e29b19abcea0ac89bdae5d4
diff --git a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch b/x11-drivers/nvidia-drivers-legacy/files/dkms.patch
index 96a0cd74..c839a849 100644
--- a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch
+++ b/x11-drivers/nvidia-drivers-legacy/files/dkms.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-legacy-dkms"
-+PACKAGE_VERSION="390.147"
++PACKAGE_VERSION="390.151"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch b/x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch
deleted file mode 100644
index a4242ec7..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/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
diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.147.ebuild b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.151.ebuild
index 2dbaa099..1d3c98cc 100644
--- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.151.ebuild
@@ -49,7 +49,6 @@ QA_PREBUILT="opt/* usr/lib*"
 
 PATCHES=( 
 	"${FILESDIR}"/dkms.patch
-	"${FILESDIR}"/kernel-5.14.patch
 )
 
 S=${WORKDIR}/