diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2024-11-18 03:24:37 -0500 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2024-11-18 04:02:34 -0500 |
commit | 9bd3fd74d941e3362dff2105a91e86a4a458f322 (patch) | |
tree | fa414b62ba3ac75c381f170801782a00c8a2e61e /x11-drivers | |
parent | x11-drivers/nvidia-drivers: drop obsolete kernel-6.7 patch in 535 (diff) | |
download | gentoo-9bd3fd74d941e3362dff2105a91e86a4a458f322.tar.gz gentoo-9bd3fd74d941e3362dff2105a91e86a4a458f322.tar.bz2 gentoo-9bd3fd74d941e3362dff2105a91e86a4a458f322.zip |
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 <ionen@gentoo.org>
Diffstat (limited to 'x11-drivers')
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() { |