From: Kevin Hilman <khilman@baylibre.com>
To: Hans Verkuil <hverkuil@xs4all.nl>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
linux-media@vger.kernel.org
Cc: "Sekhar Nori" <nsekhar@ti.com>,
"Axel Haslam" <ahaslam@baylibre.com>,
"Bartosz Gołaszewski" <bgolaszewski@baylibre.com>,
"Alexandre Bailon" <abailon@baylibre.com>,
"David Lechner" <david@lechnology.com>,
"Patrick Titiano" <ptitiano@baylibre.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 3/5] [media] davinci: vpif_capture: fix start/stop streaming locking
Date: Wed, 7 Dec 2016 10:30:23 -0800 [thread overview]
Message-ID: <20161207183025.20684-4-khilman@baylibre.com> (raw)
In-Reply-To: <20161207183025.20684-1-khilman@baylibre.com>
Video capture subdevs may be over I2C and may sleep during xfer, so we
cannot do IRQ-disabled locking when calling the subdev.
The IRQ-disabled locking is meant to protect the DMA queue list
throughout the rest of the driver, so update the locking in
[start|stop]_streaming to protect just this list, and update the irqlock
comment to reflect what it actually protects.
Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
drivers/media/platform/davinci/vpif_capture.c | 6 +++---
drivers/media/platform/davinci/vpif_capture.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index c24049acd40a..f72a719efb3d 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -179,8 +179,6 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
unsigned long addr, flags;
int ret;
- spin_lock_irqsave(&common->irqlock, flags);
-
/* Initialize field_id */
ch->field_id = 0;
@@ -211,6 +209,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
vpif_config_addr(ch, ret);
/* Get the next frame from the buffer queue */
+ spin_lock_irqsave(&common->irqlock, flags);
common->cur_frm = common->next_frm = list_entry(common->dma_queue.next,
struct vpif_cap_buffer, list);
/* Remove buffer from the buffer queue */
@@ -244,6 +243,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
return 0;
err:
+ spin_lock_irqsave(&common->irqlock, flags);
list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
list_del(&buf->list);
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
@@ -287,7 +287,6 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
vpif_dbg(1, debug, "stream off failed in subdev\n");
/* release all active buffers */
- spin_lock_irqsave(&common->irqlock, flags);
if (common->cur_frm == common->next_frm) {
vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
@@ -300,6 +299,7 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
VB2_BUF_STATE_ERROR);
}
+ spin_lock_irqsave(&common->irqlock, flags);
while (!list_empty(&common->dma_queue)) {
common->next_frm = list_entry(common->dma_queue.next,
struct vpif_cap_buffer, list);
diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index 9e35b6771d22..1d2c052deedf 100644
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -67,7 +67,7 @@ struct common_obj {
struct vb2_queue buffer_queue;
/* Queue of filled frames */
struct list_head dma_queue;
- /* Used in video-buf */
+ /* Protects the dma_queue field */
spinlock_t irqlock;
/* lock used to access this structure */
struct mutex lock;
--
2.9.3
next prev parent reply other threads:[~2016-12-07 18:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 18:30 [PATCH v6 0/5] davinci: VPIF: add DT support Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 1/5] [media] davinci: VPIF: fix module loading, init errors Kevin Hilman
2016-12-09 10:07 ` Sakari Ailus
2016-12-16 9:44 ` Hans Verkuil
2016-12-16 23:39 ` Kevin Hilman
2016-12-17 0:47 ` [PATCH v6.1 " Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 2/5] [media] davinci: vpif_capture: remove hard-coded I2C adapter id Kevin Hilman
2016-12-09 10:20 ` Sakari Ailus
2016-12-07 18:30 ` Kevin Hilman [this message]
2016-12-07 18:30 ` [PATCH v6 4/5] [media] dt-bindings: add TI VPIF documentation Kevin Hilman
2016-12-07 18:30 ` [PATCH v6 5/5] [media] davinci: VPIF: add basic support for DT init Kevin Hilman
2016-12-07 20:03 ` [PATCH v6 0/5] davinci: VPIF: add DT support Javier Martinez Canillas
2016-12-09 0:25 ` Kevin Hilman
2016-12-16 9:47 ` Hans Verkuil
2016-12-17 0:49 ` Kevin Hilman
2017-01-27 17:22 ` Kevin Hilman
2017-01-30 9:33 ` Hans Verkuil
2017-01-03 9:03 ` Sekhar Nori
2017-01-03 9:12 ` Laurent Pinchart
2017-01-04 11:32 ` Sekhar Nori
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=20161207183025.20684-4-khilman@baylibre.com \
--to=khilman@baylibre.com \
--cc=abailon@baylibre.com \
--cc=ahaslam@baylibre.com \
--cc=bgolaszewski@baylibre.com \
--cc=david@lechnology.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=ptitiano@baylibre.com \
--cc=sakari.ailus@iki.fi \
/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;
as well as URLs for NNTP newsgroup(s).