summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-515.65.01-kernel6.patch19
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild6
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)