From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC1A5158091 for ; Tue, 31 May 2022 19:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3D13E085A; Tue, 31 May 2022 19:11:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FA08E085A for ; Tue, 31 May 2022 19:11:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 579A93417B8 for ; Tue, 31 May 2022 19:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B12433C3 for ; Tue, 31 May 2022 19:11:30 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1654024233.e6d7e9f6548f13be4687fb761377be6bdf79d81f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-470.rules x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ x11-drivers/nvidia-drivers/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e6d7e9f6548f13be4687fb761377be6bdf79d81f X-VCS-Branch: master Date: Tue, 31 May 2022 19:11:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 508104d5-ef29-4145-883f-63f92a6f5c88 X-Archives-Hash: 26ec640ec6088c3debc8870d0ba82e61 commit: e6d7e9f6548f13be4687fb761377be6bdf79d81f Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 31 19:03:56 2022 +0000 Commit: Ionen Wolkens gentoo 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 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 -}