x11-drivers/nvidia-drivers SLOT 5 : version bump

4 files changed, 3 insertions, 190 deletions

diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 420ba133..761a5604 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1,3 +1,3 @@
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.256.02.run 272850014 BLAKE2B 0fdc867f92b82b2a60810c3b43751cad7ac2c39928c92c6c343c0c6044f4d7d923d93b8599db3f7c999c0ee7d16940e65d991a61cbb30e1d9e49c5639ac6bdc8 SHA512 a837946dd24d7945c1962a695f1f31965f3ceb6927f52cd08fd51b8db138b7a888bbeab69243f5c8468a7bd7ccd47f5dbdb48a1ca81264866c1ebb7d88628f88
-DIST NVIDIA-Linux-x86_64-550.107.02.run 307251605 BLAKE2B 767300982ac4b28fc731b250141cd0f5e9531424dcecd816e995c6fe63a8e2c15c0a42f9324f93c19da12868fd48abbaa15a1de752b675b88fa45a3c4385f40a SHA512 da0a15f87a4e6562f9a5e087a76b92de873db4849c8fdbf57d7dfe9d524e55dfbd578aef38d8818b9cb712a905a31fd0b97e399c74613943810545c92cf30f9d
+DIST NVIDIA-Linux-x86_64-550.120.run 307064664 BLAKE2B 657e69e2fb7c32c47e52a7bd5469158f9f5431cdf65f9ac5b660b8f4ae3511914a1efa837d4a81bb8dd63d09735a315a6b297023e6417d849f764c9a8dc0d88f SHA512 1d7c91755faacb5accdb33314b638f9749115a1ece6150e39cfe1c07d2ada022de20992c500e96d785b3813962b6214bffbe94ed6bf58a539c48d2526b534507
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms550.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms550.patch
index 0d782858..0f96154d 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms550.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms550.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-dkms"
-+PACKAGE_VERSION="550.107.02"
++PACKAGE_VERSION="550.120"
 +BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-0]\.)" # only build for kernels v5.x.x up to and including v6.10.x
  AUTOINSTALL="yes"
  
@@ -35,7 +35,7 @@ diff -Nur a/kernel-open/dkms.conf b/kernel-open/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="550.107.02"
++PACKAGE_VERSION="550.120"
 +BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-9]\.|\.|6\.1[0-0]\.)" # only build for kernels v5.x.x up to and including v6.10.x
  AUTOINSTALL="yes"
  
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
deleted file mode 100644
index 047078dd..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff '--color=auto' -Nur a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh	2024-07-24 23:57:19.000000000 +0100
-+++ b/kernel/conftest.sh	2024-10-18 10:22:27.367073132 +0100
-@@ -6593,6 +6593,25 @@
-             compile_check_conftest "$CODE" "NV_DRM_FBDEV_GENERIC_SETUP_PRESENT" "" "functions"
-         ;;
- 
-+        drm_fbdev_ttm_setup)
-+            #
-+            # Determine whether drm_fbdev_ttm_setup is present.
-+            #
-+            # Added by commit 9060d7f49376 ("drm/fb-helper: Finish the
-+            # generic fbdev emulation") in v4.19.
-+            #
-+            CODE="
-+            #include <drm/drm_fb_helper.h>
-+            #if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
-+            #include <drm/drm_fbdev_ttm.h>
-+            #endif
-+            void conftest_drm_fbdev_ttm_setup(void) {
-+                drm_fbdev_ttm_setup();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_FBDEV_TTM_SETUP_PRESENT" "" "functions"
-+        ;;
-+
-         drm_aperture_remove_conflicting_pci_framebuffers)
-             #
-             # Determine whether drm_aperture_remove_conflicting_pci_framebuffers is present.
-diff '--color=auto' -Nur a/kernel/header-presence-tests.mk b/kernel/header-presence-tests.mk
---- a/kernel/header-presence-tests.mk	2024-07-24 23:57:19.000000000 +0100
-+++ b/kernel/header-presence-tests.mk	2024-10-18 10:22:27.368073132 +0100
-@@ -15,6 +15,7 @@
-   drm/drm_atomic_uapi.h \
-   drm/drm_drv.h \
-   drm/drm_fbdev_generic.h \
-+  drm/drm_fbdev_ttm.h \
-   drm/drm_framebuffer.h \
-   drm/drm_connector.h \
-   drm/drm_probe_helper.h \
-diff '--color=auto' -Nur a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
---- a/kernel/nvidia-drm/nvidia-drm-drv.c	2024-07-25 00:22:50.000000000 +0100
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c	2024-10-18 10:22:27.368073132 +0100
-@@ -73,6 +73,10 @@
- #include <drm/drm_fbdev_generic.h>
- #endif
- 
-+#if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
-+#include <drm/drm_fbdev_ttm.h>
-+#endif
-+
- #include <linux/pci.h>
- #include <linux/workqueue.h>
- 
-@@ -1823,7 +1827,11 @@
-             drm_aperture_remove_conflicting_pci_framebuffers(pdev, nv_drm_driver.name);
- #endif
-         }
-+#if defined(NV_DRM_FBDEV_TTM_AVAILABLE)
-+        drm_fbdev_ttm_setup(dev, 32);
-+#else
-         drm_fbdev_generic_setup(dev, 32);
-+#endif
-     }
- #endif /* defined(NV_DRM_FBDEV_GENERIC_AVAILABLE) */
- 
-diff '--color=auto' -Nur a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
---- a/kernel/nvidia-drm/nvidia-drm-os-interface.h	2024-07-25 00:22:50.000000000 +0100
-+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h	2024-10-18 10:22:27.368073132 +0100
-@@ -58,8 +58,11 @@
- #error "Need to define kernel timer callback primitives for this OS"
- #endif
- 
--#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
-+#if (defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) || defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT)) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
- #define NV_DRM_FBDEV_GENERIC_AVAILABLE
-+#if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT)
-+#define NV_DRM_FBDEV_TTM_AVAILABLE
-+#endif
- #endif
- 
- struct page;
-diff '--color=auto' -Nur a/kernel/nvidia-drm/nvidia-drm-sources.mk b/kernel/nvidia-drm/nvidia-drm-sources.mk
---- a/kernel/nvidia-drm/nvidia-drm-sources.mk	2024-07-24 23:59:33.000000000 +0100
-+++ b/kernel/nvidia-drm/nvidia-drm-sources.mk	2024-10-18 10:22:27.368073132 +0100
-@@ -67,6 +67,7 @@
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += sync_file_get_fence
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffers
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_generic_setup
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_ttm_setup
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_attach_hdr_output_metadata_property
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_helper_crtc_enable_color_mgmt
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_crtc_enable_color_mgmt
-diff '--color=auto' -Nur a/kernel-open/conftest.sh b/kernel-open/conftest.sh
---- a/kernel-open/conftest.sh	2024-07-24 23:57:19.000000000 +0100
-+++ b/kernel-open/conftest.sh	2024-10-18 10:22:27.369073132 +0100
-@@ -6593,6 +6593,25 @@
-             compile_check_conftest "$CODE" "NV_DRM_FBDEV_GENERIC_SETUP_PRESENT" "" "functions"
-         ;;
- 
-+        drm_fbdev_ttm_setup)
-+            #
-+            # Determine whether drm_fbdev_ttm_setup is present.
-+            #
-+            # Added by commit 9060d7f49376 ("drm/fb-helper: Finish the
-+            # generic fbdev emulation") in v4.19.
-+            #
-+            CODE="
-+            #include <drm/drm_fb_helper.h>
-+            #if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
-+            #include <drm/drm_fbdev_ttm.h>
-+            #endif
-+            void conftest_drm_fbdev_ttm_setup(void) {
-+                drm_fbdev_ttm_setup();
-+            }"
-+
-+            compile_check_conftest "$CODE" "NV_DRM_FBDEV_TTM_SETUP_PRESENT" "" "functions"
-+        ;;
-+
-         drm_aperture_remove_conflicting_pci_framebuffers)
-             #
-             # Determine whether drm_aperture_remove_conflicting_pci_framebuffers is present.
-diff '--color=auto' -Nur a/kernel-open/header-presence-tests.mk b/kernel-open/header-presence-tests.mk
---- a/kernel-open/header-presence-tests.mk	2024-07-24 23:57:19.000000000 +0100
-+++ b/kernel-open/header-presence-tests.mk	2024-10-18 10:22:27.369073132 +0100
-@@ -15,6 +15,7 @@
-   drm/drm_atomic_uapi.h \
-   drm/drm_drv.h \
-   drm/drm_fbdev_generic.h \
-+  drm/drm_fbdev_ttm.h \
-   drm/drm_framebuffer.h \
-   drm/drm_connector.h \
-   drm/drm_probe_helper.h \
-diff '--color=auto' -Nur a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c
---- a/kernel-open/nvidia-drm/nvidia-drm-drv.c	2024-07-25 00:22:48.000000000 +0100
-+++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c	2024-10-18 10:22:27.370073132 +0100
-@@ -73,6 +73,10 @@
- #include <drm/drm_fbdev_generic.h>
- #endif
- 
-+#if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
-+#include <drm/drm_fbdev_ttm.h>
-+#endif
-+
- #include <linux/pci.h>
- #include <linux/workqueue.h>
- 
-@@ -1823,7 +1827,11 @@
-             drm_aperture_remove_conflicting_pci_framebuffers(pdev, nv_drm_driver.name);
- #endif
-         }
-+#if defined(NV_DRM_FBDEV_TTM_AVAILABLE)
-+        drm_fbdev_ttm_setup(dev, 32);
-+#else
-         drm_fbdev_generic_setup(dev, 32);
-+#endif
-     }
- #endif /* defined(NV_DRM_FBDEV_GENERIC_AVAILABLE) */
- 
-diff '--color=auto' -Nur a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
---- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h	2024-07-25 00:22:48.000000000 +0100
-+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h	2024-10-18 10:22:27.370073132 +0100
-@@ -58,8 +58,11 @@
- #error "Need to define kernel timer callback primitives for this OS"
- #endif
- 
--#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
-+#if (defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) || defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT)) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
- #define NV_DRM_FBDEV_GENERIC_AVAILABLE
-+#if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT)
-+#define NV_DRM_FBDEV_TTM_AVAILABLE
-+#endif
- #endif
- 
- struct page;
-diff '--color=auto' -Nur a/kernel-open/nvidia-drm/nvidia-drm-sources.mk b/kernel-open/nvidia-drm/nvidia-drm-sources.mk
---- a/kernel-open/nvidia-drm/nvidia-drm-sources.mk	2024-07-24 23:59:33.000000000 +0100
-+++ b/kernel-open/nvidia-drm/nvidia-drm-sources.mk	2024-10-18 10:22:27.370073132 +0100
-@@ -67,6 +67,7 @@
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += sync_file_get_fence
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffers
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_generic_setup
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_ttm_setup
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_attach_hdr_output_metadata_property
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_helper_crtc_enable_color_mgmt
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_crtc_enable_color_mgmt
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-550.107.02-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-550.120.ebuild
index dca545f1..1bc82c27 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-550.107.02-r1.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-550.120.ebuild
@@ -24,7 +24,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/dkms550.patch
-	"${FILESDIR}"/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
 )
 
 S="${WORKDIR}/${AMD64_NV_PACKAGE}"