gentoo auto-resync : 19:09:2024 - 12:11:50

5 files changed, 141 insertions, 3 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 6b2cbabb9334..fe2cefd3ba09 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -10,6 +10,7 @@ AUX nvidia-drivers-470.223.02-gpl-pfn_valid.patch 2298 BLAKE2B 5375cbf40e1974708
 AUX nvidia-drivers-525.116.04-clang-unused-option.patch 883 BLAKE2B 264cd7cf7972b686a8096c13c8e6b9cdcc8b0c32995de476482a597041160c347793ad7ef53d9d214df64c48d6e87995543e625ebace8a09845bcbc34063f529 SHA512 58f8c7b505ef4195ef0211bc06e5220fec58fa4c25ca61f45f79742516895d9339fd8ecf8abba767abf7bec121d9a6c9a539c9ac6b16fd12a25805df9fda5ae7
 AUX nvidia-drivers-525.147.05-gcc14.patch 1348 BLAKE2B bd6d048b325ea2aef59c27ec51f6060329ba78aad5a663504d4be1b0cf6e57d2422170091324ef0e225584e849073779ecfd6c04c7ce0af72751deb837366a3d SHA512 4adb7aba14d5d50dc91a966c2cfdb94c1f24eb9580d7e46a5793e3b59eae58840dd790aa1d5899b5eee8117b2dc6559805b9e7e759f98bc7ed8957387a6892b8
 AUX nvidia-drivers-535.43.22-kernel-6.7.patch 1485 BLAKE2B 06f0d46a03b4b07f906f057b06b93e56f0841118a48f74ff9d8cc15adc78e2d2a34d5bb8a63808099ef54286ea08816a69040953326c14dec04828054af6ab59 SHA512 9343294014917086b61dc72b091a7840f2a4fa929846e1554d201e38c3bc2d82b2d022e693045134eb8a52955e8df1dd3d65947f68ea8f294e6d69a23805da54
+AUX nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch 5055 BLAKE2B 2ad807c720c41d1981e3807fd6c44387a997fce244f0e9b88ca20dcd8dedf1a67a5057c2bdf0cc854eeb781c69021fdb2422a30d6ce6fd62d46509e76f2a918a SHA512 971e8a780b3c078ded47508e76d28cda3b5ed0032cde08b1b6bf84d8ad7876cf4b9de1736bbe6e57fbf550ac01d233131f95597bf013bf457734474394d3fa34
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-kernel-module-source-515.86.01-raw-ldflags.patch 628 BLAKE2B da490e4af1c898958df0ef656914e8bba3f7236fb1d2f94420a42d895d7f47ddc9cc173ef3b4b29f80ac880266767d54e76613dfc3defb1d4fe3f2b48377a71b SHA512 0a972c4efd219ddc8e814753c7c2bdea8fd0f0f3d2255bd0f9a4baab2a96319c8238cc027f602e399be9521467e110cffb1e0ee6b90f38867df49cd4c3b11c5d
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
@@ -73,7 +74,7 @@ EBUILD nvidia-drivers-390.157.ebuild 15136 BLAKE2B 6ef5e51472ecc63dec8bd6bcd4528
 EBUILD nvidia-drivers-470.256.02-r1.ebuild 17683 BLAKE2B b99e6fa06b692100321d38ec9d1207d14e2818d7977ee75424ed038191ca582f074af584a0373fe552a7382e664f74a38d3eb7aae360b32843c4d99d0f970e27 SHA512 c1ab9067dea4303cdbbe4fdc58e7e024449df41145208440d54af11bf7fc889075d85b6865616ee78308fa7c1d63ded9382021805a58b2f0cf92c4dd431cf1cc
 EBUILD nvidia-drivers-525.147.05-r1.ebuild 20997 BLAKE2B d7e0f34b40c029b64640a508b75620e62208f356979b99943b7d22895d0c432cb234214085fbdf4a00f7a31f68ae60d87f695b52efc373f79487bbfce04873ec SHA512 a2b4802077d61be25885d1f809ffe443927398656e1326725916c9977f49a3492610b9fe57dc9c5cdcf088eacc7557a4f3dab45a1e7673d6bbe32eb05cccc54c
 EBUILD nvidia-drivers-535.183.01-r1.ebuild 20847 BLAKE2B 3bb33cb7e134c89efb77ea2b5eb03f9169c73b09472c8691770fabd05e9135c6c5715aa53c02734ee3546427497856d5e5f5962529aaeae04e40a895bc25e4d6 SHA512 ac07d896a40159e7ef8df9d164052201043f6ba146ae1c19e6d8b7c964e3e867bd829fab99dfa7f889ed22cc4c5f8a4ca2b0fed2cf69e466613a4e940f61cf0d
-EBUILD nvidia-drivers-550.107.02-r1.ebuild 19937 BLAKE2B 5ec32c9eb3e0cea9efcbd7606998848ec97733fc6525cccb869e9ddb9d5d3454a8ca6afc1e1a324f400d312ca249eaa83a0255c3df34767e336e0d42a9356116 SHA512 362275b0f3a6755b4f4e6296d106a4243c8792a4ab3922923ba65bfa0e8b8b3550ae5fa8370915bd3653c0f50a94560381f3587a2cfd98bd0fd32863eeea008f
-EBUILD nvidia-drivers-550.40.71-r1.ebuild 19989 BLAKE2B c41bf1bd68db7da15cc8a9268820b321a4780886b93c7409ec72437533922f5a157abfb92c81cba808b544a67016ce6be97c7a39aceeadff022cba171ed77d52 SHA512 eadb7916525af85c87bdd767cf3bbc70ee61b9c6f21f19f577ecea83bb5d54a2dde2cdfbc3da328a8ec39ca2055b2dbc206040774f8aff54310de29dba23b12d
-EBUILD nvidia-drivers-560.35.03-r1.ebuild 20697 BLAKE2B 459f9313c33f345fa6b1575bcae202c83c0c84f9f211b5de26f678e0a798a12703824177da2ec125f3c43d9f926b73cc2e7a37933e6c77a2f5f3a9c0c3dfdf76 SHA512 d7567d7cda48c70436bd21812f2c258a04269af5e276cef875d424d2ab41d9169a55b84abf862ac3d0a644b1b740d144195cf04e1f1264b36d4514bf9d2ad332
+EBUILD nvidia-drivers-550.107.02-r1.ebuild 20002 BLAKE2B cbfa303aa81191161d5a1c0e1921c6599967be90b4b2ad8c6b661acfed96165b603f3cdeb7130030d53bc8813a3564444fa8e8ed2ad94b5b892a0536e1b4dc18 SHA512 17ac8008bbe734b6e45a4b5d152b9e032b6afe3de162ef8e4b8fa85429dc284d36f8635b991064c4fdc4f4b26149c4aaeeaf6377771cc8883671b1cc50da0e34
+EBUILD nvidia-drivers-550.40.71-r1.ebuild 20054 BLAKE2B 77d682fcdcb50d5b5b0a14afc386b70a5098a83d5a068dee0bdb557f0dbde97272f701613f84909e0fa88df5b32e87177841135b03915e64b84f5c756a20173f SHA512 e595a7ad2f2de9a6257998beb769166819b586bee84489d3c3de83a26384081d0831e9d8b778d779043e1a06adc0eca9cd3f9b1bc10dcfde579b7b92744f8b44
+EBUILD nvidia-drivers-560.35.03-r1.ebuild 20762 BLAKE2B b610c2088d6ef45f01bb33e132e21664b586c1bc6024528eaeff6d524df74d7b9aca5183ce3dca86851af8f9a9eb827bc45626a5d0c308c6dbf72a9bd92462b0 SHA512 3e06029619a3cdd4662626b071689a36ded68bd2849e5a72ae10bb60257dd20dbac8b7d21175f3ad836bb340187c219ad71512db8297439d844d4c6c80a3e75f
 MISC metadata.xml 1457 BLAKE2B 10fccbffe28ab58e012aae439123f947acea95eb3bdc4d0e2eb1ec14a92ad24fc2e3e0c248dcce87d9fdec54a65b8e040b2ed048d9ef11054f762f295c24ce39 SHA512 8469884c614a0275f438a0f8d583f2823d1159905ee27402e859c824cc458ac31daf69f2b7960533daaf86e1ca203be745c03e4e67ff12e9bbb2c08b91c667a0
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
new file mode 100644
index 000000000000..01f7e2aa1660
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
@@ -0,0 +1,134 @@
+At a glance this should(?) only be affecting fbdev=1 (default-off and
+marked experimental in nvidia.conf). Compiles fine either way given
+the test would've failed resulting in usage being skipped.
+
+NVIDIA is already aware[1] and this should be unnecessary next bumps.
+[1] https://github.com/NVIDIA/open-gpu-kernel-modules/pull/692
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -6612,2 +6612,21 @@
+ 
++        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)
+--- a/kernel/header-presence-tests.mk
++++ b/kernel/header-presence-tests.mk
+@@ -17,2 +17,3 @@
+   drm/drm_fbdev_generic.h \
++  drm/drm_fbdev_ttm.h \
+   drm/drm_framebuffer.h \
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -75,2 +75,6 @@
+ 
++#if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
++#include <drm/drm_fbdev_ttm.h>
++#endif
++
+ #include <linux/pci.h>
+@@ -1853,3 +1857,7 @@
+         }
++#if defined(NV_DRM_FBDEV_TTM_AVAILABLE)
++        drm_fbdev_ttm_setup(dev, 32);
++#else
+         drm_fbdev_generic_setup(dev, 32);
++#endif
+     }
+--- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
++++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+@@ -60,4 +60,7 @@
+ 
+-#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
+--- a/kernel/nvidia-drm/nvidia-drm-sources.mk
++++ b/kernel/nvidia-drm/nvidia-drm-sources.mk
+@@ -69,2 +69,3 @@
+ 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
+--- a/kernel-module-source/kernel-open/conftest.sh
++++ b/kernel-module-source/kernel-open/conftest.sh
+@@ -6612,2 +6612,21 @@
+ 
++        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)
+--- a/kernel-module-source/kernel-open/header-presence-tests.mk
++++ b/kernel-module-source/kernel-open/header-presence-tests.mk
+@@ -17,2 +17,3 @@
+   drm/drm_fbdev_generic.h \
++  drm/drm_fbdev_ttm.h \
+   drm/drm_framebuffer.h \
+--- a/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-drv.c
+@@ -75,2 +75,6 @@
+ 
++#if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
++#include <drm/drm_fbdev_ttm.h>
++#endif
++
+ #include <linux/pci.h>
+@@ -1853,3 +1857,7 @@
+         }
++#if defined(NV_DRM_FBDEV_TTM_AVAILABLE)
++        drm_fbdev_ttm_setup(dev, 32);
++#else
+         drm_fbdev_generic_setup(dev, 32);
++#endif
+     }
+--- a/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
++++ b/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
+@@ -60,4 +60,7 @@
+ 
+-#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
+--- a/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-sources.mk
++++ b/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-sources.mk
+@@ -69,2 +69,3 @@
+ 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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
index 17ddc58a0cfc..c0427557f1a5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
@@ -90,6 +90,7 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+	"${FILESDIR}"/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
 )
 
 pkg_setup() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild
index ce8321ba3ab2..abee29c518c4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild
@@ -91,6 +91,7 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+	"${FILESDIR}"/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
 )
 
 pkg_setup() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
index bfa3b9e55501..ac755f870b2e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
@@ -93,6 +93,7 @@ QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+	"${FILESDIR}"/nvidia-drivers-550.107.02-kernel-6.11-fbdev.patch
 )
 
 pkg_setup() {