Merge pull request #39 from hungyuhang/master

Fix build failures with Linux v6.8+

Author: jserv

fb.c

@@ -8,7 +8,7 @@
 #include "fb.h"
 
 struct vcamfb_info {
-    struct fb_info info;
+    struct fb_info *info;
     void *addr;
     unsigned int offset;
     char name[FB_NAME_MAXLENGTH];
@@ -363,7 +363,10 @@ int vcamfb_init(struct vcam_device *dev)
     /* malloc vcamfb_info */
     fb_data = vmalloc(sizeof(struct vcamfb_info));
     dev->fb_priv = (void *) fb_data;
-    info = &fb_data->info;
+
+    /* malloc fb_info */
+    fb_data->info = framebuffer_alloc(0, &dev->vdev.dev);
+    info = fb_data->info;
 
     /* malloc framebuffer and init framebuffer */
     size = dev->input_format.sizeimage * 2;
@@ -402,8 +405,6 @@ int vcamfb_init(struct vcam_device *dev)
     info->fbops = &vcamfb_ops;
     info->par = dev;
     info->pseudo_palette = NULL;
-    info->flags = FBINFO_FLAG_DEFAULT;
-    info->device = &dev->vdev.dev;
     INIT_LIST_HEAD(&info->modelist);
 
     /* set the fb_cmap */
@@ -428,25 +429,33 @@ int vcamfb_init(struct vcam_device *dev)
 
 fb_alloc_failure:
     fb_dealloc_cmap(&info->cmap);
+    framebuffer_release(info);
     return -EINVAL;
 }
 
 void vcamfb_destroy(struct vcam_device *dev)
 {
     struct vcamfb_info *fb_data = (struct vcamfb_info *) dev->fb_priv;
-    struct fb_info *info = &fb_data->info;
+    struct fb_info *info;
+
+    if (!fb_data)
+        return;
+
+    info = fb_data->info;
     if (info) {
         unregister_framebuffer(info);
-        vfree(fb_data->addr);
         fb_dealloc_cmap(&info->cmap);
-        vfree(dev->fb_priv);
+        framebuffer_release(info);
     }
+
+    vfree(fb_data->addr);
+    vfree(fb_data);
 }
 
 void vcamfb_update(struct vcam_device *dev)
 {
     struct vcamfb_info *fb_data = (struct vcamfb_info *) dev->fb_priv;
-    struct fb_info *info = &fb_data->info;
+    struct fb_info *info = fb_data->info;
     struct vcam_in_queue *q = &dev->in_queue;
 
     /* remalloc the framebuffer and vcam_in_queue */

videobuf.c

@@ -135,7 +135,11 @@ int vcam_out_videobuf2_setup(struct vcam_device *dev)
     q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
     q->ops = &vcam_vb2_ops;
     q->mem_ops = &vb2_vmalloc_memops;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
+    q->min_queued_buffers = 2;
+#else
     q->min_buffers_needed = 2;
+#endif
     q->lock = &dev->vcam_mutex;
 
     return vb2_queue_init(q);