Skip to content

Commit

Permalink
[media] vb2: return ENOBUFS in start_streaming in case of too few buf…
Browse files Browse the repository at this point in the history
…fers

This works together with the retry_start_streaming mechanism to allow userspace
to start streaming even if not all required buffers have been queued.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Tomasz Stanislawski <t.stanislaws@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kamil Debski <k.debski@samsung.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jan 7, 2014
1 parent c108e66 commit 79aeb3f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpbe_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
/* If buffer queue is empty, return error */
if (list_empty(&layer->dma_queue)) {
v4l2_err(&vpbe_dev->v4l2_dev, "buffer queue is empty\n");
return -EINVAL;
return -ENOBUFS;
}
/* Get the next frame from the buffer queue */
layer->next_frm = layer->cur_frm = list_entry(layer->dma_queue.next,
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpif_capture.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
if (list_empty(&common->dma_queue)) {
spin_unlock_irqrestore(&common->irqlock, flags);
vpif_dbg(1, debug, "buffer queue is empty\n");
return -EIO;
return -ENOBUFS;
}

/* Get the next frame from the buffer queue */
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpif_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
if (list_empty(&common->dma_queue)) {
spin_unlock_irqrestore(&common->irqlock, flags);
vpif_err("buffer queue is empty\n");
return -EIO;
return -ENOBUFS;
}

/* Get the next frame from the buffer queue */
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ static int s5p_mfc_start_streaming(struct vb2_queue *q, unsigned int count)
if (ctx->src_bufs_cnt < ctx->pb_count) {
mfc_err("Need minimum %d OUTPUT buffers\n",
ctx->pb_count);
return -EINVAL;
return -ENOBUFS;
}
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/s5p-tv/mixer_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)

if (count == 0) {
mxr_dbg(mdev, "no output buffers queued\n");
return -EINVAL;
return -ENOBUFS;
}

/* block any changes in output configuration */
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/mx2_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
unsigned long flags;

if (count < 2)
return -EINVAL;
return -ENOBUFS;

spin_lock_irqsave(&pcdev->lock, flags);

Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/media/davinci_vpfe/vpfe_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,8 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
unsigned long addr;
int ret;

if (count == 0)
return -ENOBUFS;
ret = mutex_lock_interruptible(&video->lock);
if (ret)
goto streamoff;
Expand Down

0 comments on commit 79aeb3f

Please sign in to comment.