diff -Nru nvidia-graphics-drivers-390-390.144/debian/changelog nvidia-graphics-drivers-390-390.144/debian/changelog --- nvidia-graphics-drivers-390-390.144/debian/changelog 2021-07-05 08:22:50.000000000 +0000 +++ nvidia-graphics-drivers-390-390.144/debian/changelog 2021-09-06 12:45:47.000000000 +0000 @@ -1,3 +1,11 @@ +nvidia-graphics-drivers-390 (390.144-0ubuntu2) impish; urgency=medium + + * debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch, + debian/templates/dkms_nvidia.conf.in: + - Fix build failure with Linux 5.14. + + -- Alberto Milone Mon, 06 Sep 2021 14:45:47 +0200 + nvidia-graphics-drivers-390 (390.144-0ubuntu1) impish; urgency=medium * New upstream release (LP: #1933980). diff -Nru nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch --- nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia/patches/buildfix_kernel_5.14.patch 2021-09-06 12:44:15.000000000 +0000 @@ -0,0 +1,84 @@ +From 07f6abf333755e8d209ed12a51548ed297e00d9a Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Mon, 6 Sep 2021 13:52:38 +0200 +Subject: [PATCH 1/1] Add support for Linux 5.14 + +--- + nvidia-drm/nvidia-drm-drv.c | 3 +++ + nvidia/nvlink_linux.c | 5 +++++ + nvidia/os-interface.c | 5 +++++ + 3 files changed, 13 insertions(+) + +diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c +index 54389be..2088057 100644 +--- a/nvidia-drm/nvidia-drm-drv.c ++++ b/nvidia-drm/nvidia-drm-drv.c +@@ -22,6 +22,7 @@ + + #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ + ++#include + #include "nvidia-drm-priv.h" + #include "nvidia-drm-drv.h" + #include "nvidia-drm-fb.h" +@@ -811,7 +812,9 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info) + + dev->dev_private = nv_dev; + nv_dev->dev = dev; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)) + dev->pdev = pdev; ++#endif + + /* Register DRM device to DRM sub-system */ + +diff --git a/nvidia/nvlink_linux.c b/nvidia/nvlink_linux.c +index 872bc90..97b0de0 100644 +--- a/nvidia/nvlink_linux.c ++++ b/nvidia/nvlink_linux.c +@@ -23,6 +23,7 @@ + + #include "conftest.h" + ++#include + #include "nvlink_common.h" + #include "nvlink_linux.h" + #include "nvlink_errors.h" +@@ -597,7 +598,11 @@ void NVLINK_API_CALL nvlink_sleep(unsigned int ms) + // the requested timeout has expired, loop until less + // than a jiffie of the desired delay remains. + // ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)) + current->state = TASK_INTERRUPTIBLE; ++#else ++ WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE); ++#endif + do + { + schedule_timeout(jiffies); +diff --git a/nvidia/os-interface.c b/nvidia/os-interface.c +index 3603a5a..679e997 100644 +--- a/nvidia/os-interface.c ++++ b/nvidia/os-interface.c +@@ -9,6 +9,7 @@ + */ + + #define __NO_VERSION__ ++#include + #include "nv-misc.h" + + #include "os-interface.h" +@@ -580,7 +581,11 @@ NV_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds) + // the requested timeout has expired, loop until less + // than a jiffie of the desired delay remains. + // ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)) + current->state = TASK_INTERRUPTIBLE; ++#else ++ WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE); ++#endif + do + { + schedule_timeout(jiffies); +-- +2.30.2 + diff -Nru nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf --- nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf 2021-07-05 08:22:50.000000000 +0000 +++ nvidia-graphics-drivers-390-390.144/debian/dkms_nvidia.conf 2021-09-06 12:45:47.000000000 +0000 @@ -25,6 +25,6 @@ DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm" AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" -#PATCH[1]="buildfix_kernel_5.13.patch" +PATCH[1]="buildfix_kernel_5.14.patch" #PATCH[1]="do-not-call-pci_save_state.patch" #PATCH_MATCH[0]="^4.[6-7]" diff -Nru nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in --- nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in 2021-07-05 08:22:50.000000000 +0000 +++ nvidia-graphics-drivers-390-390.144/debian/templates/dkms_nvidia.conf.in 2021-09-06 12:45:02.000000000 +0000 @@ -25,6 +25,6 @@ DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm" AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" -#PATCH[1]="buildfix_kernel_5.13.patch" +PATCH[1]="buildfix_kernel_5.14.patch" #PATCH[1]="do-not-call-pci_save_state.patch" #PATCH_MATCH[0]="^4.[6-7]"