summaryrefslogtreecommitdiff
path: root/x11-drivers/nvidia-drivers
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/nvidia-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/Manifest10
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch186
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild)1
3 files changed, 5 insertions, 192 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5af3f879..5081a07e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,15 +1,15 @@
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
DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
DIST nvidia-installer-470.256.02.tar.bz2 146269 BLAKE2B 4402e725c8fd0157eb84d4ec140a33f97e873014577487ef1e32fb8921cabe79c60ff46532e5bfaabb2b6ac894f7c80086dbab19e61906e2e27346fb85f98829 SHA512 c962dc17d9696256d1ebedcaeb3010994f2ce3895aedc47987599ebfec132a9b9a249d2ece6502b15bd4a93f9b0106aa13487a7da5f64199c274ce11eba27cfd
-DIST nvidia-installer-550.107.02.tar.bz2 155423 BLAKE2B 5bd3d57dfd9ca70c38908f5b397d71802bd78ca1de4c6d9b32de147e39adac61028ca56848b2cb10f13717046204b690c86c880034d1f386df9298e7f15c4b65 SHA512 2120f31f9ab92bb3a8da6991c4d5df6cf50ed81e5c6eadcf23f6af98f08ef674e137ac2bf62f1bf76d94f005d0fc9ef2a130d2e606fca929229f358ac51377d1
+DIST nvidia-installer-550.120.tar.bz2 155781 BLAKE2B 22846a5625bf19550c4f94996e8df5b8c30455f0a9e434069b7318a3d4e7bdd10cb6cdfdbcabecb5014a96bfd46e2267b29f79242ff3e486f1a570190c885570 SHA512 c4b64d88da9a953b574f2de0963f69aea6441f1e3cbea80a151689b03c10d57e65dbc9780c48735b813a0a45131c8a7181fe468b8fe7a9df4bdbbdc34e68ae29
DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
DIST nvidia-modprobe-470.256.02.tar.bz2 38769 BLAKE2B 0db444b09b0b6d24c04877fae95249e781d82b3141f90eb05d869b64d2b6e65ad00bf44c4e427c64dbd4765fa99a8699f80a1d95b00c66137a54dc878d7ea298 SHA512 c1cbfa6c8e188e5a5eb5d390b9a903406cbff103d212fc30e611e4023be3fde896ad84e8bb45b030beb5d1bcd8155c9e55a8f9636c45ce1e2a5c03f672989a31
-DIST nvidia-modprobe-550.107.02.tar.bz2 41486 BLAKE2B 4c74caa2f91bda9ad96e6366986e2934776cc31ae3b0dd596fe5d0392cf023a766e2fb2fc765d5886e872935028fda0836df1826fdeea2e2a76701420021778e SHA512 6fc755b50f6ccf25812ed6936560784a7ea5766152f04631829b192a070b47ba68296bc215b60d1f7a9773f2db6388214d55e115794db8cf944a6f64d19ce34f
+DIST nvidia-modprobe-550.120.tar.bz2 41490 BLAKE2B 0d2d12d533bf911aeabd5147bad7f2db24a936637cff3d974a1f92e4911810a6a42b8b415c3db4a462af459b2e7580949b6f569dd4adbc686a45dbd6527b1be8 SHA512 12d75920131350b631856b495ed5fe0bf2b8f58b4adce8088abf9128691829fb903c8ad84c0ced7d14c5cff1dc7fb3f7bbe99f41e1d36f959b24c14e3ea5619a
DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
DIST nvidia-persistenced-470.256.02.tar.bz2 46567 BLAKE2B 8f837322a3b88412fd2f6acf38721b49a6cb444fbd842d652519e5596f2e545d8f06bbdf017f46a22301ce87455f96147fab2829ca5fbf26131ec3e4a772e282 SHA512 4fd19258649b7d39945fb5c8578bf11ab118617dd14f3d11cdf15cb3fe77daf7b4719e4ae57af59031b1b809d02f4e8e8afed0ec60b9d0aed4d2488bd3013cd9
-DIST nvidia-persistenced-550.107.02.tar.bz2 49661 BLAKE2B 695bcf0211194263b38444305c5b6bd6a13331ab57c05bd85d9ea5e007af37e34b96bc450fbcb92bb12050d75c3885d51563fdc2a827f25a433283b067e204ee SHA512 6b398f53a3670d73c13be364d1c7acd563878ebe1162ff5fd0f1f3749c20284a8dd9d98cadccf1fc0b354f353006a3dd2acfd066f98601e6fe1577f0dc59631f
+DIST nvidia-persistenced-550.120.tar.bz2 61251 BLAKE2B 207a0c3a186ec40f23c06bc77614b1b869a1e4d68f5f8edcda6111df50a6a7f3474b5a3151e625584ce69b69450718b3b89207b6fe81bce8ac1676b199cd8a64 SHA512 afe71b9421652872aa4d3ca89a3abcc36bd617782ed3fbd4af31162d89c97c12fb27a16c82f4c4e54d2f4ee8b9b755dc19226ee877fbe70c8d2b5d5636064063
DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
DIST nvidia-xconfig-470.256.02.tar.bz2 108698 BLAKE2B e468574e4bc57e7279d4120e2b08a201671b50d408be0c530eabe5da7d45daaf21cbf5c7fa31410d0d732fe8ea1551cbfb21d1ae193c1b3f5b5c50c764c9e236 SHA512 9dcec1e0c2b56b4d38a5f2c76086302f8bc0860cc15012cce29c3a5062f801a48b6a2bb78344361b07a2717b58502783441a2daf402d9973a17526175b1f15ca
-DIST nvidia-xconfig-550.107.02.tar.bz2 111170 BLAKE2B dbf2b0b7f7b71f17ce5a0b6ae1c5346a573ea11163b24c4bce1b18281d4af70f38458bc122c39ad948242a8cfc37b68e696141b8dd3ce16f9ae7fb3fb61af735 SHA512 a7b9ba8d542041b273deaeb354c398fba4241dfdcf68be71e1c1138c925206db0f7ce2945c5ec92eddbcdbf240c5340802b3989e6140593828d1eb79854730e3
+DIST nvidia-xconfig-550.120.tar.bz2 111154 BLAKE2B bbb60c07497786c9947f418f2fa3e11244a53e38478db62bed4d3ccb1af8c5fd209710760df9bb727685b2f95618f91ce93b03f71aaa2e81b0001ca840e87937 SHA512 c286cf5f8fcc0eee25ca0459212b04292adda356b3ee3f0ed4c7d1aef0c859e5cd2498f7010950fb3834726f13a58ea19b84934635a0045e2a2cf843197a2d86
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
deleted file mode 100644
index 047078dd..00000000
--- a/x11-drivers/nvidia-drivers/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/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild
index 4d076225..f86871e4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild
@@ -69,7 +69,6 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
PATCHES=(
"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
- "${FILESDIR}"/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
)
pkg_setup() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:33:39 +0000