You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
3.5 KiB
Diff
96 lines
3.5 KiB
Diff
From 754a5ed1aa42ce9d5be5f84a5a0888f850b15e00 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 252/703] 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 | 22 ++++++++++++++-----
|
|
.../vc04_services/bcm2835-camera/mmal-vchiq.c | 4 ++++
|
|
.../vc04_services/bcm2835-camera/mmal-vchiq.h | 3 +++
|
|
3 files changed, 23 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
@@ -607,6 +607,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);
|
|
@@ -630,12 +631,6 @@ static void stop_streaming(struct vb2_qu
|
|
&dev->capture.frame_count,
|
|
sizeof(dev->capture.frame_count));
|
|
|
|
- /* wait for last frame to complete */
|
|
- timeout = wait_for_completion_timeout(&dev->capture.frame_cmplt, HZ);
|
|
- if (timeout == 0)
|
|
- v4l2_err(&dev->v4l2_dev,
|
|
- "timed out waiting for frame completion\n");
|
|
-
|
|
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
|
|
"disabling connection\n");
|
|
|
|
@@ -650,6 +645,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));
|
|
+ timeout = wait_for_completion_timeout(&dev->capture.frame_cmplt,
|
|
+ HZ);
|
|
+ if (timeout == 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
|
|
@@ -246,6 +246,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,
|
|
@@ -389,6 +391,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
|
|
@@ -72,6 +72,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 */
|