Kernel 6.15 - compile blackmagic-io module patch

Hello,

As an attempt to fix compiling blackmagic-io modules for kernel 6.15, here is an archive containing the patch needed.
Here is the content of the patch.

For blackmagic-io-14.4.1a4:

Code: Select all

diff -Naur ./blackmagic-io-14.4.1a4.kernel_6.13/bm_util.c ./blackmagic-io-14.4.1a4/bm_util.c
--- ./blackmagic-io-14.4.1a4.kernel_6.13/bm_util.c   2025-06-24 09:27:47.270998829 +0200
+++ ./blackmagic-io-14.4.1a4/bm_util.c   2025-06-24 09:37:29.570986491 +0200
@@ -473,7 +473,13 @@
 {
 #if KERNEL_VERSION_OR_LATER(4, 15, 0)
    struct bm_timer_wrapper* timer_wrapper = container_of(timer, struct bm_timer_wrapper, timer);
+#if KERNEL_VERSION_OR_LATER(6, 15, 0)
+   // Rel. commit "treewide: Switch/rename to timer_delete[_sync]()"
+   // (Thomas Gleixner, 5 Apr 2025)
+   timer_delete(timer);
+#else
    del_timer(timer);
+#endif
    bm_kfree(timer_wrapper);
 #else
    del_timer(timer);
@@ -493,7 +499,13 @@
 
 void bm_timer_cancel(bm_timer_t* timer)
 {
+#if KERNEL_VERSION_OR_LATER(6, 15, 0)
+   // Rel. commit "treewide: Switch/rename to timer_delete[_sync]()"
+   // (Thomas Gleixner, 5 Apr 2025)
+   timer_delete_sync(timer);
+#else
    del_timer_sync(timer);
+#endif
 }
 
 // Event waiting


Any comment are welcome.
Hope this will help.

Edit: prior applying the patch provided here, one needs to apply the patches provided for kernel 6.13 in this post:
viewtopic.php?f=12&t=215626#p1126138

Cordially,


--
NVieville

Thank you!!! I can confirm success with this patch!

Worked for me, thanks.

Also, just in case someone else stumbles onto this thread and doesn't know how to apply the patches.

cd /usr/src/blackmagic-io-'version'
sudo patch < 'location and name of the .patch file'
sudo dkms install -m blackmagic-io -v 'version number (i.e. 14.4.1a4)'