| Message ID | 1314269531-30080-1-git-send-email-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On Thursday, August 25, 2011 12:52:11 Marek Szyprowski wrote: > This patch changes the order of operations during stream on call. Now the > buffers are first queued to the driver and then the start_streaming method > is called. > > This resolves the most common case when the driver needs to know buffer > addresses to enable dma engine and start streaming. Additional parameters > to start_streaming and buffer_queue methods have been added to simplify > drivers code. The driver are now obliged to check if the number of queued > buffers is enough to enable hardware streaming. If not - it should return > an error. In such case all the buffers that have been pre-queued are > invalidated. > > Drivers that are able to start/stop streaming on-fly, can control dma > engine directly in buf_queue callback. In this case start_streaming > callback can be considered as optional. The driver can also assume that > after a few first buf_queue calls with zero 'streaming' parameter, the core > will finally call start_streaming callback. Looks good! > This patch also updates some videobuf2 clients (s5p-fimc, s5p-mfc, s5p-tv, > mem2mem_testdev and vivi) to work properly with the changed order of > operations. I assume the final patch will update all vb2 clients? I have a few very minor comments below: > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > CC: Pawel Osciak <pawel@osciak.com> > --- > drivers/media/video/mem2mem_testdev.c | 2 +- > drivers/media/video/s5p-fimc/fimc-capture.c | 66 ++++++++++++++++----------- > drivers/media/video/s5p-fimc/fimc-core.c | 2 +- > drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 4 +- > drivers/media/video/s5p-tv/mixer.h | 2 - > drivers/media/video/s5p-tv/mixer_video.c | 24 +++++----- > drivers/media/video/videobuf2-core.c | 30 +++++-------- > drivers/media/video/vivi.c | 4 +- > include/media/videobuf2-core.h | 18 +++++-- > 9 files changed, 82 insertions(+), 70 deletions(-) > --- > > Hello, > > This patch introduces significant changes in the vb2 streamon operation, > so all vb2 clients need to be checked and updated. Right now I only > updated virtual and Samsung drivers. Once we agree that this patch can > be merged, I will update it to include all the required changes for all > videobuf2 clients as well. > > Best regards > > Marek Szyprowski > Samsung Poland R&D Center > <snip> > diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c > index e89fd53..283c6ce 100644 > --- a/drivers/media/video/videobuf2-core.c > +++ b/drivers/media/video/videobuf2-core.c > @@ -823,13 +823,13 @@ static int __qbuf_mmap(struct vb2_buffer *vb, struct v4l2_buffer *b) > /** > * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing > */ > -static void __enqueue_in_driver(struct vb2_buffer *vb) > +static void __enqueue_in_driver(struct vb2_buffer *vb, bool streaming) > { > struct vb2_queue *q = vb->vb2_queue; > > vb->state = VB2_BUF_STATE_ACTIVE; > atomic_inc(&q->queued_count); > - q->ops->buf_queue(vb); > + q->ops->buf_queue(vb, streaming); > } > > /** > @@ -916,7 +916,7 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) > * If not, the buffer will be given to driver on next streamon. > */ > if (q->streaming) > - __enqueue_in_driver(vb); > + __enqueue_in_driver(vb, 1); Use 'true' instead of 1. > > dprintk(1, "qbuf of buffer %d succeeded\n", vb->v4l2_buf.index); > return 0; > @@ -1110,6 +1110,8 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) > } > EXPORT_SYMBOL_GPL(vb2_dqbuf); > > +static void __vb2_queue_cancel(struct vb2_queue *q); > + Is it possible to move __vb2_queue_cancel forward instead of having to add a forward declaration? In general you don't want forward declarations unless you have some sort of circular dependency. > /** > * vb2_streamon - start streaming > * @q: videobuf2 queue > @@ -1144,34 +1146,24 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type) > } > > /* > - * Cannot start streaming on an OUTPUT device if no buffers have > - * been queued yet. > + * If any buffers were queued before streamon, > + * we can now pass them to driver for processing. > */ > - if (V4L2_TYPE_IS_OUTPUT(q->type)) { > - if (list_empty(&q->queued_list)) { > - dprintk(1, "streamon: no output buffers queued\n"); > - return -EINVAL; > - } > - } > + list_for_each_entry(vb, &q->queued_list, queued_entry) > + __enqueue_in_driver(vb, 0); And 'false' instead of 0. > > /* > * Let driver notice that streaming state has been enabled. > */ > - ret = call_qop(q, start_streaming, q); > + ret = call_qop(q, start_streaming, q, atomic_read(&q->queued_count)); > if (ret) { > dprintk(1, "streamon: driver refused to start streaming\n"); > + __vb2_queue_cancel(q); > return ret; > } > > q->streaming = 1; > > - /* > - * If any buffers were queued before streamon, > - * we can now pass them to driver for processing. > - */ > - list_for_each_entry(vb, &q->queued_list, queued_entry) > - __enqueue_in_driver(vb); > - > dprintk(3, "Streamon successful\n"); > return 0; > } <snip> > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > index 5287e90..412daf0 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -196,15 +196,23 @@ struct vb2_buffer { > * before userspace accesses the buffer; optional > * @buf_cleanup: called once before the buffer is freed; drivers may > * perform any additional cleanup; optional > - * @start_streaming: called once before entering 'streaming' state; enables > - * driver to receive buffers over buf_queue() callback > + * @start_streaming: called once to enter 'streaming' state; the driver may > + * receive buffers with @buf_queue callback before > + * @start_streaming is called; the driver gets the number > + * of already queued buffers in count parameter; driver > + * can return an error if hardware fails or not enough > + * buffers has been queued, in such case all buffers that > + * have been already given by the @buf_queue callback are > + * invalidated. > * @stop_streaming: called when 'streaming' state must be disabled; driver > * should stop any DMA transactions or wait until they > * finish and give back all buffers it got from buf_queue() > * callback; may use vb2_wait_for_all_buffers() function > * @buf_queue: passes buffer vb to the driver; driver may start > * hardware operation on this buffer; driver should give > - * the buffer back by calling vb2_buffer_done() function > + * the buffer back by calling vb2_buffer_done() function; > + * 'streaming' parameter tells driver wheather streaming > + * state has been enabled not. > */ > struct vb2_ops { > int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers, > @@ -219,10 +227,10 @@ struct vb2_ops { > int (*buf_finish)(struct vb2_buffer *vb); > void (*buf_cleanup)(struct vb2_buffer *vb); > > - int (*start_streaming)(struct vb2_queue *q); > + int (*start_streaming)(struct vb2_queue *q, int count); Perhaps this should be unsigned instead of int? > int (*stop_streaming)(struct vb2_queue *q); > > - void (*buf_queue)(struct vb2_buffer *vb); > + void (*buf_queue)(struct vb2_buffer *vb, bool streaming); > }; > > /** Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, On Thursday, August 25, 2011 1:12 PM Hans Verkuil wrote: > On Thursday, August 25, 2011 12:52:11 Marek Szyprowski wrote: > > This patch changes the order of operations during stream on call. Now the > > buffers are first queued to the driver and then the start_streaming method > > is called. > > > > This resolves the most common case when the driver needs to know buffer > > addresses to enable dma engine and start streaming. Additional parameters > > to start_streaming and buffer_queue methods have been added to simplify > > drivers code. The driver are now obliged to check if the number of queued > > buffers is enough to enable hardware streaming. If not - it should return > > an error. In such case all the buffers that have been pre-queued are > > invalidated. > > > > Drivers that are able to start/stop streaming on-fly, can control dma > > engine directly in buf_queue callback. In this case start_streaming > > callback can be considered as optional. The driver can also assume that > > after a few first buf_queue calls with zero 'streaming' parameter, the core > > will finally call start_streaming callback. > > Looks good! > > > This patch also updates some videobuf2 clients (s5p-fimc, s5p-mfc, s5p-tv, > > mem2mem_testdev and vivi) to work properly with the changed order of > > operations. > > I assume the final patch will update all vb2 clients? Yes, of cource. I just wanted to post the patch ASAP. Updating Samsung and virtual drivers was easy because I already know a bit about them. Updating other drivers requires a bit more work to double check if I didn't break anything. > I have a few very minor comments below: Thanks for your comments :) I will include them in the final version. (snipped) Best regards
On Thu, 25 Aug 2011, Hans Verkuil wrote: > On Thursday, August 25, 2011 12:52:11 Marek Szyprowski wrote: [snip] > > @@ -1110,6 +1110,8 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) > > } > > EXPORT_SYMBOL_GPL(vb2_dqbuf); > > > > +static void __vb2_queue_cancel(struct vb2_queue *q); > > + > > Is it possible to move __vb2_queue_cancel forward instead of having to add a > forward declaration? In general you don't want forward declarations unless > you have some sort of circular dependency. IMHO, adding a forward declaration has the advantages of making the patch smaller and showing clearly, that the function has not changed, or making any changes directly visible. If such forward declarations should really be avoided, moving of affected functions could be done in a separate patch, clearly stating, that the function contents have not changed. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 25 Aug 2011 12:52:11 +0200 Marek Szyprowski <m.szyprowski@samsung.com> wrote: > This patch changes the order of operations during stream on call. Now the > buffers are first queued to the driver and then the start_streaming method > is called. This seems good to me (I guess it should, since I'm the guy who griped about it before :). > This resolves the most common case when the driver needs to know buffer > addresses to enable dma engine and start streaming. Additional parameters > to start_streaming and buffer_queue methods have been added to simplify > drivers code. The driver are now obliged to check if the number of queued > buffers is enough to enable hardware streaming. If not - it should return > an error. In such case all the buffers that have been pre-queued are > invalidated. I'd suggest that drivers that worked in the old scheme, where the buffers arrived after the start_streaming() call, should continue to work. Why not? > Drivers that are able to start/stop streaming on-fly, can control dma > engine directly in buf_queue callback. In this case start_streaming > callback can be considered as optional. The driver can also assume that > after a few first buf_queue calls with zero 'streaming' parameter, the core > will finally call start_streaming callback. This part I like a bit less. In your patch, almost none of the changed drivers use that parameter. start_streaming() is a significant state change, I don't think it's asking a lot of a driver to provide a callback and actually remember whether it's supposed to be streaming or not. Beyond that, what happens to a driver without a start_streaming() callback if the application first queues all its buffers, then does its VIDIOC_STREAMON call? I see: > + list_for_each_entry(vb, &q->queued_list, queued_entry) > + __enqueue_in_driver(vb, 0); (So we get streaming=0 for all queued buffers). > /* > * Let driver notice that streaming state has been enabled. > */ > - ret = call_qop(q, start_streaming, q); > + ret = call_qop(q, start_streaming, q, atomic_read(&q->queued_count)); > if (ret) { > dprintk(1, "streamon: driver refused to start streaming\n"); > + __vb2_queue_cancel(q); > return ret; > } The driver will have gotten all of the buffers with streaming=0, then will never get a call again; I don't think that will lead to the desired result. Am I missing something? Thanks, jon -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, On Thursday, August 25, 2011 3:27 PM Jonathan Corbet wrote: > On Thu, 25 Aug 2011 12:52:11 +0200 > Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > > This patch changes the order of operations during stream on call. Now the > > buffers are first queued to the driver and then the start_streaming method > > is called. > > This seems good to me (I guess it should, since I'm the guy who griped > about it before :). > > > This resolves the most common case when the driver needs to know buffer > > addresses to enable dma engine and start streaming. Additional parameters > > to start_streaming and buffer_queue methods have been added to simplify > > drivers code. The driver are now obliged to check if the number of queued > > buffers is enough to enable hardware streaming. If not - it should return > > an error. In such case all the buffers that have been pre-queued are > > invalidated. > > I'd suggest that drivers that worked in the old scheme, where the buffers > arrived after the start_streaming() call, should continue to work. Why > not? Such change might have some side effect - the logic in buf_queue usually assumed that the code from start_streaming has been called earlier, so some additional checks or changes might be needed. > > Drivers that are able to start/stop streaming on-fly, can control dma > > engine directly in buf_queue callback. In this case start_streaming > > callback can be considered as optional. The driver can also assume that > > after a few first buf_queue calls with zero 'streaming' parameter, the core > > will finally call start_streaming callback. > > This part I like a bit less. In your patch, almost none of the changed > drivers use that parameter. start_streaming() is a significant state > change, I don't think it's asking a lot of a driver to provide a callback > and actually remember whether it's supposed to be streaming or not. I would like to get some more comments on this. Usually this matters only to the drivers that are able to be in streaming state without any buffers (usually some camera capture interfaces), which might need to enable dma engine from buf_queue callback. Other drivers only adds the buffer to the internal list and don't care about streaming state at all. > Beyond that, what happens to a driver without a start_streaming() callback > if the application first queues all its buffers, then does its > VIDIOC_STREAMON call? I see: > > > + list_for_each_entry(vb, &q->queued_list, queued_entry) > > + __enqueue_in_driver(vb, 0); > > (So we get streaming=0 for all queued buffers). > > > /* > > * Let driver notice that streaming state has been enabled. > > */ > > - ret = call_qop(q, start_streaming, q); > > + ret = call_qop(q, start_streaming, q, atomic_read(&q->queued_count)); > > if (ret) { > > dprintk(1, "streamon: driver refused to start streaming\n"); > > + __vb2_queue_cancel(q); > > return ret; > > } > > The driver will have gotten all of the buffers with streaming=0, then will > never get a call again; I don't think that will lead to the desired result. > Am I missing something? Hmmm. Looks that I missed something. The driver will need to ignore streaming parameter in such case... Best regards
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c index 0d0c0d5..0a79c86 100644 --- a/drivers/media/video/mem2mem_testdev.c +++ b/drivers/media/video/mem2mem_testdev.c @@ -787,7 +787,7 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb) return 0; } -static void m2mtest_buf_queue(struct vb2_buffer *vb) +static void m2mtest_buf_queue(struct vb2_buffer *vb, bool streaming) { struct m2mtest_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); v4l2_m2m_buf_queue(ctx->m2m_ctx, vb); diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index e6afe5f..5f80fb4 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -151,27 +151,11 @@ static int fimc_isp_subdev_init(struct fimc_dev *fimc, unsigned int index) return ret; } -static int fimc_stop_capture(struct fimc_dev *fimc) +static void fimc_capture_state_cleanup(struct fimc_dev *fimc) { - unsigned long flags; - struct fimc_vid_cap *cap; + struct fimc_vid_cap *cap = &fimc->vid_cap; struct fimc_vid_buffer *buf; - - cap = &fimc->vid_cap; - - if (!fimc_capture_active(fimc)) - return 0; - - spin_lock_irqsave(&fimc->slock, flags); - set_bit(ST_CAPT_SHUT, &fimc->state); - fimc_deactivate_capture(fimc); - spin_unlock_irqrestore(&fimc->slock, flags); - - wait_event_timeout(fimc->irq_queue, - !test_bit(ST_CAPT_SHUT, &fimc->state), - FIMC_SHUTDOWN_TIMEOUT); - - v4l2_subdev_call(cap->sd, video, s_stream, 0); + unsigned long flags; spin_lock_irqsave(&fimc->slock, flags); fimc->state &= ~(1 << ST_CAPT_RUN | 1 << ST_CAPT_PEND | @@ -191,27 +175,50 @@ static int fimc_stop_capture(struct fimc_dev *fimc) } spin_unlock_irqrestore(&fimc->slock, flags); +} + +static int fimc_stop_capture(struct fimc_dev *fimc) +{ + struct fimc_vid_cap *cap = &fimc->vid_cap; + unsigned long flags; + + if (!fimc_capture_active(fimc)) + return 0; + + spin_lock_irqsave(&fimc->slock, flags); + set_bit(ST_CAPT_SHUT, &fimc->state); + fimc_deactivate_capture(fimc); + spin_unlock_irqrestore(&fimc->slock, flags); + + wait_event_timeout(fimc->irq_queue, + !test_bit(ST_CAPT_SHUT, &fimc->state), + FIMC_SHUTDOWN_TIMEOUT); + v4l2_subdev_call(cap->sd, video, s_stream, 0); + + fimc_capture_state_cleanup(fimc); dbg("state: 0x%lx", fimc->state); return 0; } -static int start_streaming(struct vb2_queue *q) + +static int start_streaming(struct vb2_queue *q, int count) { struct fimc_ctx *ctx = q->drv_priv; struct fimc_dev *fimc = ctx->fimc_dev; struct s5p_fimc_isp_info *isp_info; + int min_bufs; int ret; fimc_hw_reset(fimc); ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1); if (ret && ret != -ENOIOCTLCMD) - return ret; + goto error; ret = fimc_prepare_config(ctx, ctx->state); if (ret) - return ret; + goto error; isp_info = &fimc->pdata->isp_info[fimc->vid_cap.input_index]; fimc_hw_set_camera_type(fimc, isp_info); @@ -222,7 +229,7 @@ static int start_streaming(struct vb2_queue *q) ret = fimc_set_scaler_info(ctx); if (ret) { err("Scaler setup error"); - return ret; + goto error; } fimc_hw_set_input_path(ctx); fimc_hw_set_prescaler(ctx); @@ -237,13 +244,20 @@ static int start_streaming(struct vb2_queue *q) INIT_LIST_HEAD(&fimc->vid_cap.pending_buf_q); INIT_LIST_HEAD(&fimc->vid_cap.active_buf_q); - fimc->vid_cap.active_buf_cnt = 0; fimc->vid_cap.frame_count = 0; fimc->vid_cap.buf_index = 0; set_bit(ST_CAPT_PEND, &fimc->state); + min_bufs = fimc->vid_cap.reqbufs_count > 1 ? 2 : 1; + + if (fimc->vid_cap.active_buf_cnt >= min_bufs) + fimc_activate_capture(ctx); + return 0; +error: + fimc_capture_state_cleanup(fimc); + return ret; } static int stop_streaming(struct vb2_queue *q) @@ -310,7 +324,7 @@ static int buffer_prepare(struct vb2_buffer *vb) return 0; } -static void buffer_queue(struct vb2_buffer *vb) +static void buffer_queue(struct vb2_buffer *vb, bool streaming) { struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct fimc_dev *fimc = ctx->fimc_dev; @@ -341,7 +355,7 @@ static void buffer_queue(struct vb2_buffer *vb) min_bufs = vid_cap->reqbufs_count > 1 ? 2 : 1; - if (vid_cap->active_buf_cnt >= min_bufs && + if (streaming && vid_cap->active_buf_cnt >= min_bufs && !test_and_set_bit(ST_CAPT_STREAM, &fimc->state)) fimc_activate_capture(ctx); diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c index 36d127f..8152756 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.c +++ b/drivers/media/video/s5p-fimc/fimc-core.c @@ -733,7 +733,7 @@ static int fimc_buf_prepare(struct vb2_buffer *vb) return 0; } -static void fimc_buf_queue(struct vb2_buffer *vb) +static void fimc_buf_queue(struct vb2_buffer *vb, bool streaming) { struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c index dbc94b8..13099b8 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c @@ -864,7 +864,7 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb) return 0; } -static int s5p_mfc_start_streaming(struct vb2_queue *q) +static int s5p_mfc_start_streaming(struct vb2_queue *q, int count) { struct s5p_mfc_ctx *ctx = fh_to_ctx(q->drv_priv); struct s5p_mfc_dev *dev = ctx->dev; @@ -919,7 +919,7 @@ static int s5p_mfc_stop_streaming(struct vb2_queue *q) } -static void s5p_mfc_buf_queue(struct vb2_buffer *vb) +static void s5p_mfc_buf_queue(struct vb2_buffer *vb, bool streaming) { struct vb2_queue *vq = vb->vb2_queue; struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv); diff --git a/drivers/media/video/s5p-tv/mixer.h b/drivers/media/video/s5p-tv/mixer.h index e224224..51ad59b 100644 --- a/drivers/media/video/s5p-tv/mixer.h +++ b/drivers/media/video/s5p-tv/mixer.h @@ -111,8 +111,6 @@ struct mxr_buffer { enum mxr_layer_state { /** layers is not shown */ MXR_LAYER_IDLE = 0, - /** state between STREAMON and hardware start */ - MXR_LAYER_STREAMING_START, /** layer is shown */ MXR_LAYER_STREAMING, /** state before STREAMOFF is finished */ diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 8bea0f3..ba84d35 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -758,25 +758,16 @@ static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, return 0; } -static void buf_queue(struct vb2_buffer *vb) +static void buf_queue(struct vb2_buffer *vb, bool streaming) { struct mxr_buffer *buffer = container_of(vb, struct mxr_buffer, vb); struct mxr_layer *layer = vb2_get_drv_priv(vb->vb2_queue); struct mxr_device *mdev = layer->mdev; unsigned long flags; - int must_start = 0; spin_lock_irqsave(&layer->enq_slock, flags); - if (layer->state == MXR_LAYER_STREAMING_START) { - layer->state = MXR_LAYER_STREAMING; - must_start = 1; - } list_add_tail(&buffer->list, &layer->enq_list); spin_unlock_irqrestore(&layer->enq_slock, flags); - if (must_start) { - layer->ops.stream_set(layer, MXR_ENABLE); - mxr_streamer_get(mdev); - } mxr_dbg(mdev, "queuing buffer\n"); } @@ -797,13 +788,19 @@ static void wait_unlock(struct vb2_queue *vq) mutex_unlock(&layer->mutex); } -static int start_streaming(struct vb2_queue *vq) +static int start_streaming(struct vb2_queue *vq, int count) { struct mxr_layer *layer = vb2_get_drv_priv(vq); struct mxr_device *mdev = layer->mdev; unsigned long flags; mxr_dbg(mdev, "%s\n", __func__); + + if (count == 0) { + mxr_dbg(mdev, "no output buffers queued\n"); + return -EINVAL; + } + /* block any changes in output configuration */ mxr_output_get(mdev); @@ -814,9 +811,12 @@ static int start_streaming(struct vb2_queue *vq) layer->ops.format_set(layer); /* enabling layer in hardware */ spin_lock_irqsave(&layer->enq_slock, flags); - layer->state = MXR_LAYER_STREAMING_START; + layer->state = MXR_LAYER_STREAMING; spin_unlock_irqrestore(&layer->enq_slock, flags); + layer->ops.stream_set(layer, MXR_ENABLE); + mxr_streamer_get(mdev); + return 0; } diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index e89fd53..283c6ce 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -823,13 +823,13 @@ static int __qbuf_mmap(struct vb2_buffer *vb, struct v4l2_buffer *b) /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing */ -static void __enqueue_in_driver(struct vb2_buffer *vb) +static void __enqueue_in_driver(struct vb2_buffer *vb, bool streaming) { struct vb2_queue *q = vb->vb2_queue; vb->state = VB2_BUF_STATE_ACTIVE; atomic_inc(&q->queued_count); - q->ops->buf_queue(vb); + q->ops->buf_queue(vb, streaming); } /** @@ -916,7 +916,7 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) * If not, the buffer will be given to driver on next streamon. */ if (q->streaming) - __enqueue_in_driver(vb); + __enqueue_in_driver(vb, 1); dprintk(1, "qbuf of buffer %d succeeded\n", vb->v4l2_buf.index); return 0; @@ -1110,6 +1110,8 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) } EXPORT_SYMBOL_GPL(vb2_dqbuf); +static void __vb2_queue_cancel(struct vb2_queue *q); + /** * vb2_streamon - start streaming * @q: videobuf2 queue @@ -1144,34 +1146,24 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type) } /* - * Cannot start streaming on an OUTPUT device if no buffers have - * been queued yet. + * If any buffers were queued before streamon, + * we can now pass them to driver for processing. */ - if (V4L2_TYPE_IS_OUTPUT(q->type)) { - if (list_empty(&q->queued_list)) { - dprintk(1, "streamon: no output buffers queued\n"); - return -EINVAL; - } - } + list_for_each_entry(vb, &q->queued_list, queued_entry) + __enqueue_in_driver(vb, 0); /* * Let driver notice that streaming state has been enabled. */ - ret = call_qop(q, start_streaming, q); + ret = call_qop(q, start_streaming, q, atomic_read(&q->queued_count)); if (ret) { dprintk(1, "streamon: driver refused to start streaming\n"); + __vb2_queue_cancel(q); return ret; } q->streaming = 1; - /* - * If any buffers were queued before streamon, - * we can now pass them to driver for processing. - */ - list_for_each_entry(vb, &q->queued_list, queued_entry) - __enqueue_in_driver(vb); - dprintk(3, "Streamon successful\n"); return 0; } diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 26eda47..17e7e1d 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -752,7 +752,7 @@ static void buffer_cleanup(struct vb2_buffer *vb) } -static void buffer_queue(struct vb2_buffer *vb) +static void buffer_queue(struct vb2_buffer *vb, bool streaming) { struct vivi_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivi_buffer *buf = container_of(vb, struct vivi_buffer, vb); @@ -766,7 +766,7 @@ static void buffer_queue(struct vb2_buffer *vb) spin_unlock_irqrestore(&dev->slock, flags); } -static int start_streaming(struct vb2_queue *vq) +static int start_streaming(struct vb2_queue *vq, int count) { struct vivi_dev *dev = vb2_get_drv_priv(vq); dprintk(dev, 1, "%s\n", __func__); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 5287e90..412daf0 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -196,15 +196,23 @@ struct vb2_buffer { * before userspace accesses the buffer; optional * @buf_cleanup: called once before the buffer is freed; drivers may * perform any additional cleanup; optional - * @start_streaming: called once before entering 'streaming' state; enables - * driver to receive buffers over buf_queue() callback + * @start_streaming: called once to enter 'streaming' state; the driver may + * receive buffers with @buf_queue callback before + * @start_streaming is called; the driver gets the number + * of already queued buffers in count parameter; driver + * can return an error if hardware fails or not enough + * buffers has been queued, in such case all buffers that + * have been already given by the @buf_queue callback are + * invalidated. * @stop_streaming: called when 'streaming' state must be disabled; driver * should stop any DMA transactions or wait until they * finish and give back all buffers it got from buf_queue() * callback; may use vb2_wait_for_all_buffers() function * @buf_queue: passes buffer vb to the driver; driver may start * hardware operation on this buffer; driver should give - * the buffer back by calling vb2_buffer_done() function + * the buffer back by calling vb2_buffer_done() function; + * 'streaming' parameter tells driver wheather streaming + * state has been enabled not. */ struct vb2_ops { int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers, @@ -219,10 +227,10 @@ struct vb2_ops { int (*buf_finish)(struct vb2_buffer *vb); void (*buf_cleanup)(struct vb2_buffer *vb); - int (*start_streaming)(struct vb2_queue *q); + int (*start_streaming)(struct vb2_queue *q, int count); int (*stop_streaming)(struct vb2_queue *q); - void (*buf_queue)(struct vb2_buffer *vb); + void (*buf_queue)(struct vb2_buffer *vb, bool streaming); }; /**