diff -Nru nvidia-graphics-drivers-470-470.182.03/debian/changelog nvidia-graphics-drivers-470-470.182.03/debian/changelog --- nvidia-graphics-drivers-470-470.182.03/debian/changelog 2023-05-18 13:47:54.000000000 +0000 +++ nvidia-graphics-drivers-470-470.182.03/debian/changelog 2023-06-29 10:24:52.000000000 +0000 @@ -1,3 +1,12 @@ +nvidia-graphics-drivers-470 (470.182.03-0ubuntu3) mantic; urgency=medium + + * debian/dkms_nvidia.conf, + debian/templates/dkms_nvidia.conf.in, + debian/dkms_nvidia/patches/buildfix_kernel_6.4.patch: + - Support linux 6.4 ABI (LP: #2025266). + + -- Paolo Pisati Thu, 29 Jun 2023 10:24:52 +0000 + nvidia-graphics-drivers-470 (470.182.03-0ubuntu2) mantic; urgency=medium [ Paolo Pisati ] diff -Nru nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia/patches/buildfix_kernel_6.4.patch nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia/patches/buildfix_kernel_6.4.patch --- nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia/patches/buildfix_kernel_6.4.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia/patches/buildfix_kernel_6.4.patch 2023-06-29 10:24:52.000000000 +0000 @@ -0,0 +1,63 @@ +From 324e2c1be17cec11fb90dc840f1c035f1975d437 Mon Sep 17 00:00:00 2001 +From: Paolo Pisati +Date: Thu, 29 Jun 2023 12:49:27 +0000 +Subject: [PATCH] buildfix kernel 6.4 + +Upstream commit 96a7b60f6ddb2bc966fac800c1dd18876a6e3c3f removed +.dumb_destroy() hook ("drm_gem_handle_delete(file_priv, handle)" +was already the default fallback). + +Signed-off-by: Paolo Pisati +--- + nvidia-drm/nvidia-drm-drv.c | 1 - + nvidia-drm/nvidia-drm-gem-nvkms-memory.c | 8 -------- + nvidia-drm/nvidia-drm-gem-nvkms-memory.h | 4 ---- + 3 files changed, 13 deletions(-) + +diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c +index 8ef4c277..0de1c5a5 100644 +--- a/nvidia-drm/nvidia-drm-drv.c ++++ b/nvidia-drm/nvidia-drm-drv.c +@@ -873,7 +873,6 @@ static void nv_drm_update_drm_driver_features(void) + + nv_drm_driver.dumb_create = nv_drm_dumb_create; + nv_drm_driver.dumb_map_offset = nv_drm_dumb_map_offset; +- nv_drm_driver.dumb_destroy = nv_drm_dumb_destroy; + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } + +diff --git a/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/nvidia-drm/nvidia-drm-gem-nvkms-memory.c +index ca6c6646..786f21e7 100644 +--- a/nvidia-drm/nvidia-drm-gem-nvkms-memory.c ++++ b/nvidia-drm/nvidia-drm-gem-nvkms-memory.c +@@ -531,12 +531,4 @@ int nv_drm_dumb_map_offset(struct drm_file *file, + + return ret; + } +- +-int nv_drm_dumb_destroy(struct drm_file *file, +- struct drm_device *dev, +- uint32_t handle) +-{ +- return drm_gem_handle_delete(file, handle); +-} +- + #endif +diff --git a/nvidia-drm/nvidia-drm-gem-nvkms-memory.h b/nvidia-drm/nvidia-drm-gem-nvkms-memory.h +index d449e3ac..d93f1519 100644 +--- a/nvidia-drm/nvidia-drm-gem-nvkms-memory.h ++++ b/nvidia-drm/nvidia-drm-gem-nvkms-memory.h +@@ -94,10 +94,6 @@ int nv_drm_dumb_map_offset(struct drm_file *file, + struct drm_device *dev, uint32_t handle, + uint64_t *offset); + +-int nv_drm_dumb_destroy(struct drm_file *file, +- struct drm_device *dev, +- uint32_t handle); +- + struct drm_gem_object *nv_drm_gem_nvkms_prime_import( + struct drm_device *dev, + struct drm_gem_object *gem); +-- +2.40.1 + diff -Nru nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia.conf nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia.conf --- nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia.conf 2023-05-18 13:47:54.000000000 +0000 +++ nvidia-graphics-drivers-470-470.182.03/debian/dkms_nvidia.conf 2023-06-29 10:24:52.000000000 +0000 @@ -14,6 +14,7 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_6.3.patch" +PATCH[2]="buildfix_kernel_6.4.patch" #PATCH[1]="buildfix_kernel_6.2.patch" #PATCH[1]="buildfix_kernel_5.19.patch" # Apply from v4 to v5.12 kernels diff -Nru nvidia-graphics-drivers-470-470.182.03/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-470-470.182.03/debian/templates/dkms_nvidia.conf.in --- nvidia-graphics-drivers-470-470.182.03/debian/templates/dkms_nvidia.conf.in 2023-05-18 13:47:54.000000000 +0000 +++ nvidia-graphics-drivers-470-470.182.03/debian/templates/dkms_nvidia.conf.in 2023-06-29 10:24:52.000000000 +0000 @@ -14,6 +14,7 @@ AUTOINSTALL="yes" PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch" PATCH[1]="buildfix_kernel_6.3.patch" +PATCH[2]="buildfix_kernel_6.4.patch" #PATCH[1]="buildfix_kernel_6.2.patch" #PATCH[1]="buildfix_kernel_5.19.patch" # Apply from v4 to v5.12 kernels