[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/

[Ionen Wolkens]

commit:     e6d7e9f6548f13be4687fb761377be6bdf79d81f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 19:03:56 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May 31 19:10:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d7e9f6

x11-drivers/nvidia-drivers: revert installation of PM rules

Turns out this is only needed if users manually enabled
DynamicPowerManagement (not default) and feel this should not be
installed by default (no revbump given not known to be harmful
and will be cleaned on kernel upgrades).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/files/nvidia-470.rules           |  7 -------
 x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild | 11 +----------
 x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild  | 11 +----------
 x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild  | 11 +----------
 x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild  | 11 +----------
 x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild  | 11 +----------
 6 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-470.rules b/x11-drivers/nvidia-drivers/files/nvidia-470.rules
deleted file mode 100644
index ba3cefef9876..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-470.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
-ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
-
-# Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
-ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
-ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
index 0288dd432838..19ecb17aad10 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs udev unpacker user-info
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.18"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -367,9 +367,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# udev rules taken from nvidia's README.txt to help with power management
-	use driver && udev_newrules "${FILESDIR}"/nvidia-470.rules 60-nvidia.rules
 }
 
 pkg_preinst() {
@@ -401,7 +398,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	use driver && udev_reload
 
 	readme.gentoo_print_elog
 
@@ -453,8 +449,3 @@ pkg_postinst() {
 		elog "supported by a few wayland compositors (e.g. kwin / mutter, not sway)."
 	fi
 }
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	use driver && udev_reload
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
index 88c5511fa81a..8c77f921b745 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs udev unpacker user-info
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.15"
 NV_PIN="470.103.01"
@@ -363,9 +363,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
 
 	dobin nvidia-bug-report.sh
-
-	# udev rules taken from nvidia's README.txt to help with power management
-	use driver && udev_newrules "${FILESDIR}"/nvidia-470.rules 60-nvidia.rules
 }
 
 pkg_preinst() {
@@ -397,7 +394,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	use driver && udev_reload
 
 	readme.gentoo_print_elog
 
@@ -449,8 +445,3 @@ pkg_postinst() {
 		elog "supported by a few wayland compositors (e.g. kwin / mutter, not sway)."
 	fi
 }
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	use driver && udev_reload
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
index c8428c85a142..0921e41c8ac8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs udev unpacker user-info
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.18"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -380,9 +380,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# udev rules taken from nvidia's README.txt to help with power management
-	use driver && udev_newrules "${FILESDIR}"/nvidia-470.rules 60-nvidia.rules
 }
 
 pkg_preinst() {
@@ -414,7 +411,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	use driver && udev_reload
 
 	readme.gentoo_print_elog
 
@@ -463,8 +459,3 @@ pkg_postinst() {
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
 }
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	use driver && udev_reload
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
index 6b86f430e3c4..b3f07bbc73fc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs udev unpacker user-info
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.18"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -404,9 +404,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# fails to detect version (i.e. mismatch, or with kernel-open)
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# udev rules taken from nvidia's README.txt to help with power management
-	use driver && udev_newrules "${FILESDIR}"/nvidia-470.rules 60-nvidia.rules
 }
 
 pkg_preinst() {
@@ -438,7 +435,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	use driver && udev_reload
 
 	readme.gentoo_print_elog
 
@@ -498,8 +494,3 @@ pkg_postinst() {
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
 }
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	use driver && udev_reload
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild
index 03d8a9d79a37..462e7a7ec053 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs udev unpacker user-info
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.18"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -403,9 +403,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# fails to detect version (i.e. mismatch, or with kernel-open)
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# udev rules taken from nvidia's README.txt to help with power management
-	use driver && udev_newrules "${FILESDIR}"/nvidia-470.rules 60-nvidia.rules
 }
 
 pkg_preinst() {
@@ -437,7 +434,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	use driver && udev_reload
 
 	readme.gentoo_print_elog
 
@@ -497,8 +493,3 @@ pkg_postinst() {
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
 }
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	use driver && udev_reload
-}