Patches for Linux 6.0

pop-os · Oct 21, 2022 · b8c0232 · b8c0232
1 parent 1f94f41
commit b8c0232
Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/debian/dkms_nvidia.conf b/debian/dkms_nvidia.conf
@@ -13,5 +13,5 @@ BUILT_MODULE_NAME[2]="nvidia-drm"
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
 PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
-#PATCH[1]="do-not-call-pci_save_state.patch"
+PATCH[1]="buildfix_kernel_6.0.patch"
 #PATCH_MATCH[0]="^4.[6-7]"
diff --git a/debian/dkms_nvidia/patches/buildfix_kernel_6.0.patch b/debian/dkms_nvidia/patches/buildfix_kernel_6.0.patch
@@ -0,0 +1,16 @@
+diff --git a/nvidia-drm/nvidia-drm-helper.c b/nvidia-drm/nvidia-drm-helper.c
+index 3831180..e615aef 100644
+--- a/nvidia-drm/nvidia-drm-helper.c
++++ b/nvidia-drm/nvidia-drm-helper.c
+@@ -41,6 +41,11 @@
+ #include <drm/drm_atomic_uapi.h>
+ #endif
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
++#include <drm/drm_framebuffer.h>
++#endif
++
+ static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb)
+ {
+ #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)
diff --git a/debian/templates/dkms_nvidia.conf.in b/debian/templates/dkms_nvidia.conf.in
@@ -13,5 +13,5 @@ BUILT_MODULE_NAME[2]="nvidia-drm"
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
 PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
-#PATCH[1]="do-not-call-pci_save_state.patch"
+PATCH[1]="buildfix_kernel_6.0.patch"
 #PATCH_MATCH[0]="^4.[6-7]"