Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbc6ddc authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Ensure all buffers are returned on disable 



commit 70ec64ccdaac5d8f634338e33b016c1c99831499 upstream.

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: 93841670 ("staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping")
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4502c43d

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+16 −6
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ static void stop_streaming(struct vb2_queue *vq) 
	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);
@@ -605,12 +606,6 @@ static void stop_streaming(struct vb2_queue *vq) 
				      &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");
@@ -625,6 +620,21 @@ static void stop_streaming(struct vb2_queue *vq) 
			 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");

}

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+4 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ static void buffer_work_cb(struct work_struct *work) 
	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,
@@ -381,6 +383,8 @@ buffer_from_host(struct vchiq_mmal_instance *instance, 
	/* initialise work structure ready to schedule callback */

	INIT_WORK(&msg_context->u.bulk.work, buffer_work_cb);



	atomic_inc(&port->buffers_with_vpu);



	/* prep the buffer from host message */

	memset(&m, 0xbc, sizeof(m));	/* just to make debug clearer */

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,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 */