Get rid of the initial 5.12 kernel patch. It reportedly doesn't work on 5.12rc2+. Add an explicit 5.11 or lower kernel compat for 455 and lower branches. 460.67 is currently the only driver working on 5.12rc2+
parent
7399076106
commit
9b7d9b0c0d
@ -1,30 +0,0 @@
|
||||
diff --git a/kernel-dkms/nvidia-drm/nvidia-drm-drv.c b/kernel-dkms/nvidia-drm/nvidia-drm-drv.c
|
||||
index 9582531..c23a338 100644
|
||||
--- a/kernel-dkms/nvidia-drm/nvidia-drm-drv.c
|
||||
+++ b/kernel-dkms/nvidia-drm/nvidia-drm-drv.c
|
||||
@@ -796,6 +797,13 @@ static struct drm_driver nv_drm_driver = {
|
||||
#endif
|
||||
};
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0))
|
||||
+// Reimport trivial forwarder function deleted in commit "drm: Don't export the drm_gem_dumb_destroy() function" (file drivers/gpu/drm/drm_gem.c)
|
||||
+static int nv_drm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev, u32 handle)
|
||||
+{
|
||||
+ return drm_gem_handle_delete(file, handle);
|
||||
+}
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Update the global nv_drm_driver for the intended features.
|
||||
@@ -819,7 +827,11 @@ 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;
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0))
|
||||
nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy;
|
||||
+#else
|
||||
+ nv_drm_driver.dumb_destroy = nv_drm_gem_dumb_destroy;
|
||||
+#endif
|
||||
#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
|
||||
}
|
||||
|
Loading…
Reference in New Issue