gentoo auto-resync : 27:06:2024 - 07:59:39

4 files changed, 55 insertions, 2 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index b4a47dbe8873..e682072004fb 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 13235e6d1d32..a78a2127f2e9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -2,6 +2,7 @@ AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131
 AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
 AUX nvidia-470.conf 1219 BLAKE2B 334975e048d2cafbbf5fc9d0a74ce9cea4af82103be4d02539d91bb3da4fb39fbb24f64dd6240a526259306c5b971323c00104e2254893fd433f3ef56c9ba8f2 SHA512 6e218dd8da6cfd2d13a259a461348221b65d8475e018c0a6ef5856fd177748306569751545171237c84ccbe3ac526231184bcbe286507f18b32a3518c40bdcb7
 AUX nvidia-545.conf 1525 BLAKE2B d5b0cdae95a16c5f921a231c8411126dc77be49c75ca15dea8376b40884ce5ed36b156aa3cb9f4492bb2c00339e9c23482138859f107baf953b5d57431ab93f7 SHA512 01578e8199ff0c81f5f8ef5defe3b0098d1c1ca0209c8dae59412677be7f70bb99c766512cff62f170b93f1b449c4918be313326697f410c426fe4d9d24a6762
+AUX nvidia-555.conf 1831 BLAKE2B 80542b7ac03049a61f8927bf1dd71f20f7dcf03ec2eed50fa1fe31b8643de47c642d3df67e3d3c434d8815f723607d74c3b57a2f2d6f64ea4bf4f776618ab54f SHA512 368fe18ff7cefa766ec6d68cd2564b2a946c9ac655dec86f806a7c5314c0987675574d1b32813b0dc07040ed823338919344f30c9445005b5f0016538837e627
 AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef2b37317606bec1c108dbc56653898cfa9318de6e47df21e5b38943212caf13bc6412f2427fad7c534491d868d03399091e2146daaa SHA512 1349c1c715b2f09e64a5e91412aceabc80041d070a6bbacfdf7038872f1f4a798bbc63277d47a25d1a5b28b573b3d5bd6295dadbbdbf245f5cfb0241879a3bc4
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
@@ -98,5 +99,5 @@ EBUILD nvidia-drivers-535.183.01.ebuild 17499 BLAKE2B e06cd90559e3af3ec6f6f38904
 EBUILD nvidia-drivers-550.40.63.ebuild 16637 BLAKE2B c2abf908a46b278823df2bc7e9d9360d7206503741662708bb6dddf83f91d7ece0efaad6b3aa806c5a15553e3ecf32a8b79d3f38539518e18d5b2abccd68fa27 SHA512 1501b2eead71186bade11d6efd8888b47944d4b77c437304efcb87ece9a8c433569bb0d8873029a44b6c8dabebf76cdbc474317183f69a67cf99fdcb73691d8a
 EBUILD nvidia-drivers-550.78.ebuild 16588 BLAKE2B 6cebe5de291b90b518e590bf29a7dded93cd57767d41c47899aec0f70251f7013c86e3b3291f3849bab943cac1e285454de6b1ef36e7d3bba91460aa16be3fa3 SHA512 515acafda6faadc2d1cddb891e00f50f9fa369389f672ebca8b256c4093ce0aa11d777aeb21f33a74acebd119f9aacf61cc7e9db4ebfb7a03ebcfe179ad37219
 EBUILD nvidia-drivers-550.90.07.ebuild 16588 BLAKE2B 6cebe5de291b90b518e590bf29a7dded93cd57767d41c47899aec0f70251f7013c86e3b3291f3849bab943cac1e285454de6b1ef36e7d3bba91460aa16be3fa3 SHA512 515acafda6faadc2d1cddb891e00f50f9fa369389f672ebca8b256c4093ce0aa11d777aeb21f33a74acebd119f9aacf61cc7e9db4ebfb7a03ebcfe179ad37219
-EBUILD nvidia-drivers-555.52.04.ebuild 16682 BLAKE2B 16a8cac4fb6d9e95cdf6088e7feb35015bebe14d4a553b37f9511c2b5865b3577e8019d30a5c0ab98fa54df9792e5d574934f92b66da8e0bf3985b1a79dafc24 SHA512 298a8bc2ef966392351019197ce01da49fbc9042784f976210f87a92a2f8039cb2ac51f143d8c6b10486948758cb197c6330ed71ec16b0cd3f79b551d3c7714d
+EBUILD nvidia-drivers-555.52.04.ebuild 17058 BLAKE2B 44e68dd3d71e0a1059bbc4e377e4e343a016fe8ec41f619a704f62ea443665825332b54c938f74c2e9e6be4f0347b75ad35a355dce04876325df49a2c23dcba2 SHA512 42025ab4dfe960d0139535304f81a80ceb95939fd9004cd8092db3a22448c93d00c923c2839ce19bf1821ce73770f17fd7d50a6ee4c7979e18ff402df1ebaab2
 MISC metadata.xml 1397 BLAKE2B b39a2ca7389d6086a5344ee5afe276387bbb784ad52504a3d1e36ab387e18174b8d1eabf6c97a94815ce24ef4daf31e64664da387b3148b455de1074131d783f SHA512 b6389b117ac27de432477d0ed0c9e29deb41a3f4d115266d547d4e2babe531251eedfc0a65e4bbf0089242b562c79ac9d1b3fafd72e571584ceb6fd2f8f28192
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-555.conf b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
new file mode 100644
index 000000000000..e0c1b09808f8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
@@ -0,0 +1,43 @@
+# NVIDIA drivers options
+# See /usr/share/doc/nvidia-drivers-*/README.txt* for more information.
+
+# nvidia-drivers and nouveau cannot be used at same time.
+# Comment out the following line if you wish to allow nouveau.
+blacklist nouveau
+
+# Kernel Mode Setting (notably needed for fbdev and wayland).
+# Enabling may possibly cause issues with SLI and Reverse PRIME.
+#options nvidia-drm modeset=1
+
+# Enable experimental framebuffer console support (^ requires modeset=1).
+# Replaces efifb or similar once loaded. Note that unloading nvidia modules
+# to, e.g. load a new version, would result in losing console display
+# (emphasis on being experimental, mode switch could cause issues with X).
+#options nvidia-drm fbdev=1
+
+# Disable use of the GSP firmware which has newly been enabled by default
+# for GPUs that support it (Turing/Ampere+ GPUs, aka GTX 1650+). Not
+# recommended unless experience regressions for which disabling helps.
+# Cannot be disabled if using USE="kernel-open".
+#options nvidia NVreg_EnableGpuFirmware=0
+
+# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
+# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+options nvidia \
+	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_TemporaryFilePath=/var/tmp
+
+# !!! Security Warning !!!
+# Do not change the DeviceFile options unless you know what you are doing.
+# Only add trusted users to the 'video' group, these users may be able to
+# crash, compromise, or irreparably damage the machine.
+options nvidia \
+	NVreg_DeviceFileGID=@VIDEOGID@ \
+	NVreg_DeviceFileMode=432 \
+	NVreg_DeviceFileUID=0 \
+	NVreg_ModifyDeviceFiles=1
+
+# Should be no need to touch anything below.
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+remove nvidia modprobe -r --ignore-remove nvidia-drm nvidia-modeset nvidia-uvm nvidia
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
index bd5205a9ad26..3d3eb15c1661 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
@@ -146,7 +146,7 @@ src_prepare() {
 	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
 
 	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
+	cp "${FILESDIR}"/nvidia-555.conf "${T}"/nvidia.conf || die
 	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
 
 	# makefile attempts to install wayland library even if not built
@@ -499,4 +499,13 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	if use !kernel-open && [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 555
+	then
+		elog
+		elog "If using a Turing/Ampere+ GPU (aka GTX 1650+), note that >=nvidia-drivers-555"
+		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
+		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
+	fi
 }