From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Jiri Kosina <trivial@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [PATCH v4 12/13] media: platform: pxa_camera: change stop_streaming semantics
Date: Mon, 15 Aug 2016 21:02:02 +0200 [thread overview]
Message-ID: <1471287723-25451-13-git-send-email-robert.jarzmik@free.fr> (raw)
In-Reply-To: <1471287723-25451-1-git-send-email-robert.jarzmik@free.fr>
Instead of the legacy behavior where it was required to wait for all
video buffers to be finished by the hardware, use a cancel like strategy
: as soon as the stop_streaming() call is done, abort all DMA transfers,
report the already buffers as failed and return.
This makes stop_streaming() more a "cancel capture" than a "wait for end
of capture" semantic.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/media/platform/soc_camera/pxa_camera.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index fb89b85f59ab..868c6ad4784c 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -523,7 +523,8 @@ static void pxa_camera_stop_capture(struct pxa_camera_dev *pcdev)
}
static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
- struct pxa_buffer *buf)
+ struct pxa_buffer *buf,
+ enum vb2_buffer_state state)
{
struct vb2_buffer *vb = &buf->vbuf.vb2_buf;
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
@@ -645,7 +646,7 @@ static void pxa_camera_dma_irq(struct pxa_camera_dev *pcdev,
}
buf->active_dma &= ~act_dma;
if (!buf->active_dma) {
- pxa_camera_wakeup(pcdev, buf);
+ pxa_camera_wakeup(pcdev, buf, VB2_BUF_STATE_DONE);
pxa_camera_check_link_miss(pcdev, last_buf->cookie[chan],
last_issued);
}
@@ -1087,7 +1088,15 @@ static int pxac_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
static void pxac_vb2_stop_streaming(struct vb2_queue *vq)
{
- vb2_wait_for_all_buffers(vq);
+ struct pxa_camera_dev *pcdev = vb2_get_drv_priv(vq);
+ struct pxa_buffer *buf, *tmp;
+
+ dev_dbg(pcdev_to_dev(pcdev), "%s active=%p\n",
+ __func__, pcdev->active);
+ pxa_camera_stop_capture(pcdev);
+
+ list_for_each_entry_safe(buf, tmp, &pcdev->capture, queue)
+ pxa_camera_wakeup(pcdev, buf, VB2_BUF_STATE_ERROR);
}
static struct vb2_ops pxac_vb2_ops = {
--
2.1.4
next prev parent reply other threads:[~2016-08-15 19:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 19:01 [PATCH v4 00/13] pxa_camera transition to v4l2 standalone device Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 01/13] media: mt9m111: make a standalone v4l2 subdevice Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 02/13] media: mt9m111: use only the SRGB colorspace Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 03/13] media: mt9m111: move mt9m111 out of soc_camera Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 04/13] media: platform: pxa_camera: convert to vb2 Robert Jarzmik
2016-08-16 6:32 ` Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 05/13] media: platform: pxa_camera: trivial move of functions Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 06/13] media: platform: pxa_camera: introduce sensor_call Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 07/13] media: platform: pxa_camera: make printk consistent Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 08/13] media: platform: pxa_camera: add buffer sequencing Robert Jarzmik
2016-08-15 19:01 ` [PATCH v4 09/13] media: platform: pxa_camera: remove set_crop Robert Jarzmik
2016-08-15 19:02 ` [PATCH v4 10/13] media: platform: pxa_camera: make a standalone v4l2 device Robert Jarzmik
2016-08-15 19:02 ` [PATCH v4 11/13] media: platform: pxa_camera: add debug register access Robert Jarzmik
2016-08-15 19:02 ` Robert Jarzmik [this message]
2016-08-15 19:02 ` [PATCH v4 13/13] media: platform: pxa_camera: move pxa_camera out of soc_camera Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471287723-25451-13-git-send-email-robert.jarzmik@free.fr \
--to=robert.jarzmik@free.fr \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®