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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63A8E1581D8 for ; Mon, 18 Nov 2024 09:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E7EBE0B63; Mon, 18 Nov 2024 09:06:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 888D3E0B63 for ; Mon, 18 Nov 2024 09:06:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C653A33DF47 for ; Mon, 18 Nov 2024 09:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26CA01B55 for ; Mon, 18 Nov 2024 09:06:15 +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: <1731920554.9bd3fd74d941e3362dff2105a91e86a4a458f322.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-drivers-565.57.01-kernel-6.12.patch x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.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: 9bd3fd74d941e3362dff2105a91e86a4a458f322 X-VCS-Branch: master Date: Mon, 18 Nov 2024 09:06:15 +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: c9add30a-f4ac-4e3f-aa62-e692703149c5 X-Archives-Hash: b964ceb84ddd20c21d21faa24d50f6fd commit: 9bd3fd74d941e3362dff2105a91e86a4a458f322 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 18 08:24:37 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 18 09:02:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd3fd74 x11-drivers/nvidia-drivers: bump KERNEL_MAX to 6.12 where possible Don't really recommend 6.12 yet, but it *should* mostly work. There *may* be issues for which it is unclear if they were limited to older 6.12-rc1 or so and not the actual 6.12. It's possible that some issues only surface with specific kernel configs and so they're hard to pick up. Normally don't do patches, but in this case it compiles even though it's going to be semi-broken without it at runtime. FOP_UNSIGNED_OFFSET is unset for <6.12 so this should have no impact for older kernels. 0/vulkan fails to build, and 0/470 was already broken with 6.10. Signed-off-by: Ionen Wolkens gentoo.org> .../nvidia-drivers-565.57.01-kernel-6.12.patch | 25 ++++++++++++++++++++++ .../nvidia-drivers-535.216.01-r1.ebuild | 3 ++- .../nvidia-drivers-550.127.05-r1.ebuild | 3 ++- .../nvidia-drivers-565.57.01-r3.ebuild | 3 ++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-565.57.01-kernel-6.12.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-565.57.01-kernel-6.12.patch new file mode 100644 index 000000000000..de964d520dde --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-565.57.01-kernel-6.12.patch @@ -0,0 +1,25 @@ +https://github.com/NVIDIA/open-gpu-kernel-modules/issues/712 +https://forums.developer.nvidia.com/t/patch-for-565-57-01-linux-kernel-6-12/313260 +https://github.com/Binary-Eater/open-gpu-kernel-modules/commit/8ac26d3c66ea88b0f80504bdd1e907658b41609d.patch +--- a/kernel/nvidia-drm/nvidia-drm-drv.c ++++ b/kernel/nvidia-drm/nvidia-drm-drv.c +@@ -1712,4 +1712,8 @@ + + .llseek = noop_llseek, ++ ++#if defined(FOP_UNSIGNED_OFFSET) ++ .fop_flags = FOP_UNSIGNED_OFFSET, ++#endif + }; + +--- a/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-drv.c ++++ b/kernel-module-source/kernel-open/nvidia-drm/nvidia-drm-drv.c +@@ -1712,4 +1712,8 @@ + + .llseek = noop_llseek, ++ ++#if defined(FOP_UNSIGNED_OFFSET) ++ .fop_flags = FOP_UNSIGNED_OFFSET, ++#endif + }; + diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild index 9e36108889c6..fdd7ee295a8d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.11 +MODULES_KERNEL_MAX=6.12 NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -93,6 +93,7 @@ PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch "${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch + "${FILESDIR}"/nvidia-drivers-565.57.01-kernel-6.12.patch ) pkg_setup() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild index f34ae07f3e62..222d95fdaa81 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.11 +MODULES_KERNEL_MAX=6.12 NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -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-565.57.01-kernel-6.12.patch ) pkg_setup() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild index 6f2fc8b8718f..ab706faf496f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.11 +MODULES_KERNEL_MAX=6.12 NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -94,6 +94,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-565.57.01-kernel-6.12.patch ) pkg_setup() {