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

Commit 61634976 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Mauro Carvalho Chehab
Browse files

[media] media: platform: pxa_camera: add buffer sequencing 



Add sequence numbers to completed buffers.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 295ab497

drivers/media/platform/soc_camera/pxa_camera.c

+5 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ struct pxa_camera_dev { 
	struct list_head	capture;



	spinlock_t		lock;

	unsigned int		buf_sequence;



	struct pxa_buffer	*active;

	struct tasklet_struct	task_eof;
@@ -423,10 +424,13 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev, 
			      struct pxa_buffer *buf)

{

	struct vb2_buffer *vb = &buf->vbuf.vb2_buf;

	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);



	/* _init is used to debug races, see comment in pxa_camera_reqbufs() */

	list_del_init(&buf->queue);

	vb->timestamp = ktime_get_ns();

	vbuf->sequence = pcdev->buf_sequence++;

	vbuf->field = V4L2_FIELD_NONE;

	vb2_buffer_done(vb, VB2_BUF_STATE_DONE);

	dev_dbg(pcdev_to_dev(pcdev), "%s dequeud buffer (buf=0x%p)\n",

		__func__, buf);
@@ -1022,6 +1026,7 @@ static int pxac_vb2_start_streaming(struct vb2_queue *vq, unsigned int count) 
	dev_dbg(pcdev_to_dev(pcdev), "%s(count=%d) active=%p\n",

		__func__, count, pcdev->active);



	pcdev->buf_sequence = 0;

	if (!pcdev->active)

		pxa_camera_start_capture(pcdev);