brcm2708: add kernel 4.14 support

[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.14 / 950-0404-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch

diff --git a/target/linux/brcm2708/patches-4.14/950-0404-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch b/target/linux/brcm2708/patches-4.14/950-0404-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch
new file mode 100644 (file)
index 0000000..b2d7b86
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0404-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch
@@ -0,0 +1,82 @@
+From 13e015450812772f21c874dd310abe3379b87bb5 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Thu, 28 Jun 2018 15:57:25 +0100
+Subject: [PATCH 404/454] staging: bcm2835_camera: Ensure all buffers are
+ returned on disable
+
+With the recent change to match MMAL and V4L2 buffers there
+is a need to wait for all MMAL buffers to be returned during
+stop_streaming.
+
+Fixes: 9384167 "staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping"
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../bcm2835-camera/bcm2835-camera.c              | 16 ++++++++++++++++
+ .../vc04_services/bcm2835-camera/mmal-vchiq.c    |  4 ++++
+ .../vc04_services/bcm2835-camera/mmal-vchiq.h    |  3 +++
+ 3 files changed, 23 insertions(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -615,6 +615,7 @@ static void stop_streaming(struct vb2_qu
+       int ret;
+       unsigned long timeout;
+       struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);
++      struct vchiq_mmal_port *port = dev->capture.port;
+ 
+       v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "%s: dev:%p\n",
+                __func__, dev);
+@@ -658,6 +659,21 @@ static void stop_streaming(struct vb2_qu
+                        ret);
+       }
+ 
++      /* wait for all buffers to be returned */
++      while (atomic_read(&port->buffers_with_vpu)) {
++              v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++                       "%s: Waiting for buffers to be returned - %d outstanding\n",
++                       __func__, atomic_read(&port->buffers_with_vpu));
++              ret = wait_for_completion_timeout(&dev->capture.frame_cmplt,
++                                                HZ);
++              if (ret <= 0) {
++                      v4l2_err(&dev->v4l2_dev, "%s: Timeout waiting for buffers to be returned - %d outstanding\n",
++                               __func__,
++                               atomic_read(&port->buffers_with_vpu));
++                      break;
++              }
++      }
++
+       if (disable_camera(dev) < 0)
+               v4l2_err(&dev->v4l2_dev, "Failed to disable camera\n");
+ }
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+@@ -318,6 +318,8 @@ static void buffer_work_cb(struct work_s
+       struct mmal_msg_context *msg_context =
+               container_of(work, struct mmal_msg_context, u.bulk.work);
+ 
++      atomic_dec(&msg_context->u.bulk.port->buffers_with_vpu);
++
+       msg_context->u.bulk.port->buffer_cb(msg_context->u.bulk.instance,
+                                           msg_context->u.bulk.port,
+                                           msg_context->u.bulk.status,
+@@ -461,6 +463,8 @@ buffer_from_host(struct vchiq_mmal_insta
+       INIT_WORK(&msg_context->u.bulk.buffer_to_host_work,
+                 buffer_to_host_work_cb);
+ 
++      atomic_inc(&port->buffers_with_vpu);
++
+       /* prep the buffer from host message */
+       memset(&m, 0xbc, sizeof(m));    /* just to make debug clearer */
+ 
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
+@@ -75,6 +75,9 @@ struct vchiq_mmal_port {
+       struct list_head buffers;
+       /* lock to serialise adding and removing buffers from list */
+       spinlock_t slock;
++
++      /* Count of buffers the VPU has yet to return */
++      atomic_t buffers_with_vpu;
+       /* callback on buffer completion */
+       vchiq_mmal_buffer_cb buffer_cb;
+       /* callback context */