From: William Towle <william.towle@xxxxxxxxxxxxxxx>
Move the buffer state test in the .buf_cleanup handler into
.stop_streaming so that a) the vb2_queue API is not subverted, and
b) tracking of active-state buffers via priv->queue_buf[] is handled
as early as is possible
Signed-off-by: William Towle <william.towle@xxxxxxxxxxxxxxx>
---
drivers/media/platform/soc_camera/rcar_vin.c | 36 ++++++++++----------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 20dbedf..bf60074 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -486,28 +486,8 @@ static void rcar_vin_videobuf_release(struct vb2_buffer *vb)
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct rcar_vin_priv *priv = ici->priv;
- unsigned int i;
- int buf_in_use = 0;
- spin_lock_irq(&priv->lock);
-
- /* Is the buffer in use by the VIN hardware? */
- for (i = 0; i < MAX_BUFFER_NUM; i++) {
- if (priv->queue_buf[i] == vb) {
- buf_in_use = 1;
- break;
- }
- }
- if (buf_in_use) {
- rcar_vin_wait_stop_streaming(priv);
-
- /*
- * Capturing has now stopped. The buffer we have been asked
- * to release could be any of the current buffers in use, so
- * release all buffers that are in use by HW
- */
- priv->queue_buf[i] = NULL;
- }
+ spin_lock_irq(&priv->lock);
list_del_init(to_buf_list(vb));
@@ -533,8 +513,20 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
rcar_vin_wait_stop_streaming(priv);
for (i = 0; i < vq->num_buffers; ++i)
- if (vq->bufs[i]->state == VB2_BUF_STATE_ACTIVE)
+ if (vq->bufs[i]->state == VB2_BUF_STATE_ACTIVE) {
+ int j;
+
+ /* Is this a buffer we have told the
+ * hardware about? Update the associated
+ * list, if so
+ */
+ for (j = 0; j < MAX_BUFFER_NUM; j++) {
+ if (priv->queue_buf[j] == vq->bufs[i]) {
+ priv->queue_buf[j] = NULL;
+ }
+ }
vb2_buffer_done(vq->bufs[i], VB2_BUF_STATE_ERROR);
+ }
list_for_each_safe(buf_head, tmp, &priv->capture)
list_del_init(buf_head);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
