diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-10-02 01:23:34 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-10-02 02:23:05 -0400 |
| commit | 28eb1f8c76963eb75f18e66072ac4244a367dacd (patch) | |
| tree | 981a26a62fb09b05929db859b73e9ae994723b8c /x11-drivers | |
| parent | dev-util/diffoscope: Stabilize 223 x86, #873946 (diff) | |
| download | gentoo-28eb1f8c76963eb75f18e66072ac4244a367dacd.tar.gz gentoo-28eb1f8c76963eb75f18e66072ac4244a367dacd.tar.bz2 gentoo-28eb1f8c76963eb75f18e66072ac4244a367dacd.zip | |
x11-drivers/nvidia-drivers: patch 515.65.01 for >=kernel-6.0-rc1
Mostly because the fixed 515.76 is masked. Meant to fix more
versions, but older branches have other problems.
Unlikely to break again between -rc7 and release, but still
skipping updating NV_KERNEL_MAX until can try 6.0.0.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch | 19 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch new file mode 100644 index 000000000000..5cdf2f639c6b --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch @@ -0,0 +1,19 @@ +Normally avoid adding kernel support patches, but this one is very +trivial and many want to use 6.0 early. + +Masked 515.76 has a more elaborate fix to ensure it works with +all supported kernel branches (not all have this header), so +this one should be conditional as a safety. + +Note older drivers branches have bigger issues and this is not +sufficient, this will wait until their next release. + +https://github.com/NVIDIA/open-gpu-kernel-modules/pull/350 +--- a/kernel/nvidia-drm/nvidia-drm-helper.h ++++ b/kernel/nvidia-drm/nvidia-drm-helper.h +@@ -109,4 +109,5 @@ + */ + #include <drm/drm_crtc.h> ++#include <drm/drm_framebuffer.h> + + #if defined(drm_for_each_plane) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild index 9c35dd8fe324..f694157692b4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild @@ -232,6 +232,12 @@ src_prepare() { eapply --directory=kernel-module-source/kernel-open \ -p2 "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch + if kernel_is -ge 6; then # conditional as a safety, see patch + eapply "${FILESDIR}"/nvidia-drivers-515.65.01-kernel6.patch + eapply --directory=kernel-module-source/kernel-open \ + -p2 "${FILESDIR}"/nvidia-drivers-515.65.01-kernel6.patch + fi + default # prevent detection of incomplete kernel DRM support (bug #603818) |